From 4bd6934a050e4a047a470985c753b1362feaa290 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 8 Feb 2016 12:24:29 +0100 Subject: [PATCH 001/624] Initial commit Module for SuperMicro A1SRI-2758F --- README.md | 16 ++++++++++++++++ supermicro/a1sri-2758f.nix | 8 ++++++++ 2 files changed, 24 insertions(+) create mode 100644 README.md create mode 100644 supermicro/a1sri-2758f.nix diff --git a/README.md b/README.md new file mode 100644 index 000000000000..8d70cb0926c5 --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +A collection of NixOS modules covering hardware quirks. + +Modules should favor usability and stability, so performance hacks +should be activated by an additional a NixOS option or conservative +and performance configs can be declared in seperate modules. + +## Usage +The simplest way to use this repo for now is to clone locally and include by path: +``` nix +{ config, pkgs, ... }: + +{ + imports = + [ /home/user/nixos-hardware/acme/thunkpad-2000.nix ]; +} +''' diff --git a/supermicro/a1sri-2758f.nix b/supermicro/a1sri-2758f.nix new file mode 100644 index 000000000000..d2aeb94d3364 --- /dev/null +++ b/supermicro/a1sri-2758f.nix @@ -0,0 +1,8 @@ +# http://www.supermicro.com/products/motherboard/Atom/X10/A1SRi-2758F.cfm + +{ ... }: + +{ + # The Linux NIC driver doesn't properly report link status. + networking.dhcpcd.extraConfig = "nolink"; +} From aff2f272ff106e0babcc297866ec971b80a9ef1b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 8 Feb 2016 15:02:19 +0300 Subject: [PATCH 002/624] supermicro/x10sll-f: init --- supermicro/x10sll-f.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 supermicro/x10sll-f.nix diff --git a/supermicro/x10sll-f.nix b/supermicro/x10sll-f.nix new file mode 100644 index 000000000000..f60e6cf6fa0e --- /dev/null +++ b/supermicro/x10sll-f.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + ipmitool + ]; + + boot.kernelModules = [ "jc42" "ipmi_devintf" "ipmi_si" "tpm_rng" ]; + + # services.cron.systemCronJobs = [ + # # Reset 5-minute watchdog timer every minute + # "* * * * * ${pkgs.ipmitool}/bin/ipmitool raw 0x30 0x97 1 5" + # ]; +} From ad5412b9f2460ae17e1defbcfb682995f563830f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 8 Feb 2016 15:12:20 +0300 Subject: [PATCH 003/624] lenovo/t440p.nix: init --- lenovo/t440p.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 lenovo/t440p.nix diff --git a/lenovo/t440p.nix b/lenovo/t440p.nix new file mode 100644 index 000000000000..47f5f66387bd --- /dev/null +++ b/lenovo/t440p.nix @@ -0,0 +1,10 @@ +{ config, pkgs, ... }: + +{ + boot = { + extraModprobeConfig = '' + options bbswitch use_acpi_to_detect_card_state=1 + ''; + kernelModules = [ "kvm-intel" "tpm-rng" ]; + }; +} From bc435e7ddc6001fa68ca3bb893457a0d1edfdb1f Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 8 Feb 2016 18:50:09 +0300 Subject: [PATCH 004/624] audio-gd/compass2: init --- audio-gd/compass2.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 audio-gd/compass2.nix diff --git a/audio-gd/compass2.nix b/audio-gd/compass2.nix new file mode 100644 index 000000000000..6115572588e9 --- /dev/null +++ b/audio-gd/compass2.nix @@ -0,0 +1,9 @@ +{ config, pkgs, ... }: + +{ + boot = { + extraModprobeConfig = '' + options snd slots=snd_usb_audio,snd-hda-intel + ''; + }; +} From 2ead29d3d08ff6300870cc20009f7513fed69ae8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 10 Feb 2016 12:24:29 +0100 Subject: [PATCH 005/624] supermicro/a1sri-2758f: enable ipmi --- supermicro/a1sri-2758f.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/supermicro/a1sri-2758f.nix b/supermicro/a1sri-2758f.nix index d2aeb94d3364..3471704467f9 100644 --- a/supermicro/a1sri-2758f.nix +++ b/supermicro/a1sri-2758f.nix @@ -1,8 +1,16 @@ # http://www.supermicro.com/products/motherboard/Atom/X10/A1SRi-2758F.cfm +# +# This board contains a TPM header, but you must supply your own module. +# -{ ... }: +{ pkgs, ... }: { - # The Linux NIC driver doesn't properly report link status. + environment.systemPackages = [ pkgs.ipmitool ]; + boot.kernelModules = [ "ipmi_devintf" "ipmi_si" ]; + + # The Linux NIC driver seems to have faulty link state reporting + # that causes dhcpcd to release every few seconds, which is + # more annoying than not releasing when a cable is unplugged. networking.dhcpcd.extraConfig = "nolink"; } From 19a7fef101fcbbf5a4f2ecd35109c1baf6fc0ca6 Mon Sep 17 00:00:00 2001 From: Allen Short Date: Wed, 10 Feb 2016 10:41:46 -0600 Subject: [PATCH 006/624] USB Armory configuration --- usbarmory/configuration.nix | 61 + usbarmory/customKernel.config | 3195 +++++++++++++++++++++++++++++++++ usbarmory/usbarmory_dts.patch | 418 +++++ 3 files changed, 3674 insertions(+) create mode 100644 usbarmory/configuration.nix create mode 100644 usbarmory/customKernel.config create mode 100644 usbarmory/usbarmory_dts.patch diff --git a/usbarmory/configuration.nix b/usbarmory/configuration.nix new file mode 100644 index 000000000000..77efd5efea2b --- /dev/null +++ b/usbarmory/configuration.nix @@ -0,0 +1,61 @@ +{ pkgs, config, lib, ... }: +{ + nix.binaryCaches = lib.mkForce [ "http://nixos-arm.dezgeg.me/channel" ]; + nix.binaryCachePublicKeys = [ "nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%" ]; + nixpkgs.config.packageOverrides = pkgs: rec { + linuxPackages_usbarmory = pkgs.recurseIntoAttrs ( + pkgs.linuxPackagesFor ( + pkgs.buildLinux rec { + version = "4.4.0"; + src = pkgs.fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz"; + sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"; + }; + configfile = /etc/nixos/customKernel.config; + kernelPatches = [ + { patch = /etc/nixos/usbarmory_dts.patch; + name = "usbarmory_dts"; } + ]; + allowImportFromDerivation = true; + } + ) linuxPackages_usbarmory); + }; + boot = { + initrd.kernelModules = []; + kernelParams = [ "console=ttymxc0,115200" ]; + kernelModules = [ "ledtrig_heartbeat" "ci_hdrc_imx" "g_ether" ]; + extraModprobeConfig = "options g_ether use_eem=0 dev_addr=1a:55:89:a2:69:41 host_addr=1a:55:89:a2:69:42"; + kernelPackages = pkgs.linuxPackages_usbarmory; + + loader = { + grub.enable = false; + generic-extlinux-compatible = { + enable = true; + }; + }; + }; + networking = { + interfaces.usb0.ip4 = [ { address = "172.16.0.2"; prefixLength = 24;} ]; + hostName = "usbarmory"; + defaultGateway = "172.16.0.1"; + nameservers = [ "8.8.8.8" ]; + firewall.enable = false; +}; + sound.enable = false; + services = { + nixosManual.enable = false; + openssh.enable = true; + openssh.permitRootLogin = "without-password"; + }; + fileSystems = { + "/boot" = { + device = "/dev/disk/by-label/NIXOS_BOOT"; + fsType = "vfat"; + }; + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + }; + }; + +} diff --git a/usbarmory/customKernel.config b/usbarmory/customKernel.config new file mode 100644 index 000000000000..5c6b47fe8354 --- /dev/null +++ b/usbarmory/customKernel.config @@ -0,0 +1,3195 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm 4.4.0 Kernel Configuration +# +CONFIG_ARM=y +CONFIG_ARM_HAS_SG_CHAIN=y +CONFIG_MIGHT_HAVE_PCI=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_GENERIC_BUG=y +CONFIG_PGTABLE_LEVELS=2 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_DMIID=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +# CONFIG_COMPILE_TEST is not set +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +# CONFIG_KERNEL_LZ4 is not set +CONFIG_DEFAULT_HOSTNAME="usbarmory" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_FHANDLE=y +CONFIG_USELIB=y +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_HANDLE_DOMAIN_IRQ=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_GENERIC_CLOCKEVENTS=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set + +# +# RCU Subsystem +# +CONFIG_PREEMPT_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +# CONFIG_TASKS_RCU is not set +CONFIG_RCU_STALL_COMMON=y +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_EXPEDITE_BOOT is not set +CONFIG_BUILD_BIN2C=y +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +# CONFIG_CGROUP_FREEZER is not set +# CONFIG_CGROUP_PIDS is not set +# CONFIG_CGROUP_DEVICE is not set +# CONFIG_CPUSETS is not set +# CONFIG_CGROUP_CPUACCT is not set +# CONFIG_MEMCG is not set +# CONFIG_CGROUP_SCHED is not set +# CONFIG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +# CONFIG_USER_NS is not set +CONFIG_PID_NS=y +CONFIG_NET_NS=y +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +# CONFIG_SGETMASK_SYSCALL is not set +CONFIG_SYSFS_SYSCALL=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +# CONFIG_BPF_SYSCALL is not set +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +# CONFIG_USERFAULTFD is not set +CONFIG_MEMBARRIER=y +CONFIG_EMBEDDED=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_SLUB_DEBUG is not set +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_SYSTEM_DATA_VERIFICATION is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_JUMP_LABEL=y +# CONFIG_STATIC_KEYS_SELFTEST is not set +# CONFIG_UPROBES is not set +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +# CONFIG_CC_STACKPROTECTOR is not set +CONFIG_CC_STACKPROTECTOR_NONE=y +# CONFIG_CC_STACKPROTECTOR_REGULAR is not set +# CONFIG_CC_STACKPROTECTOR_STRONG is not set +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +# CONFIG_MODULE_COMPRESS is not set +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_BSGLIB is not set +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_CMDLINE_PARSER=y + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +CONFIG_CMDLINE_PARTITION=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" +CONFIG_ASN1=m +CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C24XX is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP1 is not set + +# +# Multiple platform selection +# + +# +# CPU Core family selection +# +# CONFIG_ARCH_MULTI_V6 is not set +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y +# CONFIG_ARCH_MULTI_CPU_AUTO is not set +# CONFIG_ARCH_VIRT is not set +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCM is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_DIGICOLOR is not set +# CONFIG_ARCH_HIGHBANK is not set +# CONFIG_ARCH_HISI is not set +# CONFIG_ARCH_KEYSTONE is not set +# CONFIG_ARCH_MESON is not set +CONFIG_ARCH_MXC=y +CONFIG_MXC_TZIC=y +CONFIG_HAVE_IMX_SRC=y + +# +# Device tree only +# + +# +# Cortex-A platforms +# +CONFIG_SOC_IMX5=y +# CONFIG_SOC_IMX50 is not set +# CONFIG_SOC_IMX51 is not set +CONFIG_SOC_IMX53=y +# CONFIG_SOC_IMX6Q is not set +# CONFIG_SOC_IMX6SL is not set +# CONFIG_SOC_IMX6SX is not set +# CONFIG_SOC_IMX6UL is not set +# CONFIG_SOC_IMX7D is not set +# CONFIG_SOC_LS1021A is not set + +# +# Cortex-A/Cortex-M asymmetric multiprocessing platforms +# +# CONFIG_SOC_VF610 is not set +# CONFIG_ARCH_MEDIATEK is not set + +# +# TI OMAP/AM/DM/DRA Family +# +# CONFIG_ARCH_OMAP3 is not set +# CONFIG_ARCH_OMAP4 is not set +# CONFIG_SOC_OMAP5 is not set +# CONFIG_SOC_AM33XX is not set +# CONFIG_SOC_AM43XX is not set +# CONFIG_SOC_DRA7XX is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_SOCFPGA is not set +# CONFIG_PLAT_SPEAR is not set +# CONFIG_ARCH_STI is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_SHMOBILE_MULTI is not set +# CONFIG_ARCH_SUNXI is not set +# CONFIG_ARCH_SIRF is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_UNIPHIER is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_WM8850 is not set +# CONFIG_ARCH_ZX is not set +# CONFIG_ARCH_ZYNQ is not set + +# +# Processor Type +# +CONFIG_CPU_V7=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +# CONFIG_ARM_LPAE is not set +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_VIRT_EXT=y +# CONFIG_SWP_EMULATE is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_KUSER_HELPERS=y +# CONFIG_VDSO is not set +CONFIG_OUTER_CACHE=y +CONFIG_OUTER_CACHE_SYNC=y +CONFIG_MIGHT_HAVE_CACHE_L2X0=y +CONFIG_CACHE_L2X0=y +# CONFIG_PL310_ERRATA_588369 is not set +# CONFIG_PL310_ERRATA_727915 is not set +# CONFIG_PL310_ERRATA_753970 is not set +# CONFIG_PL310_ERRATA_769419 is not set +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_ARM_HEAVY_MB=y +# CONFIG_ARM_KERNMEM_PERMS is not set +CONFIG_MULTI_IRQ_HANDLER=y +# CONFIG_ARM_ERRATA_430973 is not set +# CONFIG_ARM_ERRATA_720789 is not set +# CONFIG_ARM_ERRATA_754322 is not set +# CONFIG_ARM_ERRATA_775420 is not set +# CONFIG_ARM_ERRATA_773022 is not set + +# +# Bus support +# +# CONFIG_PCI is not set +# CONFIG_PCI_DOMAINS_GENERIC is not set +# CONFIG_PCI_SYSCALL is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +CONFIG_HAVE_SMP=y +# CONFIG_SMP is not set +# CONFIG_HAVE_ARM_ARCH_TIMER is not set +# CONFIG_VMSPLIT_3G is not set +# CONFIG_VMSPLIT_3G_OPT is not set +CONFIG_VMSPLIT_2G=y +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0x80000000 +# CONFIG_ARM_PSCI is not set +CONFIG_ARCH_NR_GPIO=0 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_HZ_FIXED=0 +CONFIG_HZ_100=y +# CONFIG_HZ_200 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +# CONFIG_HZ_500 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 +CONFIG_SCHED_HRTICK=y +# CONFIG_THUMB2_KERNEL is not set +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_HAVE_ARCH_PFN_VALID=y +# CONFIG_HIGHMEM is not set +CONFIG_CPU_SW_DOMAIN_PAN=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +# CONFIG_ARM_MODULE_PLTS is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_NO_BOOTMEM=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y +CONFIG_CLEANCACHE=y +# CONFIG_FRONTSWAP is not set +# CONFIG_CMA is not set +CONFIG_ZPOOL=m +CONFIG_ZBUD=m +CONFIG_ZSMALLOC=m +# CONFIG_PGTABLE_MAPPING is not set +# CONFIG_ZSMALLOC_STAT is not set +# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +CONFIG_SECCOMP=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +# CONFIG_XEN is not set + +# +# Boot options +# +CONFIG_USE_OF=y +CONFIG_ATAGS=y +# CONFIG_DEPRECATED_PARAM_STRUCT is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +# CONFIG_ARM_APPENDED_DTB is not set +CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext4 ip=off" +CONFIG_CMDLINE_FROM_BOOTLOADER=y +# CONFIG_CMDLINE_EXTEND is not set +# CONFIG_CMDLINE_FORCE is not set +# CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set +CONFIG_AUTO_ZRELADDR=y + +# +# CPU Power Management +# + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m + +# +# CPU frequency scaling drivers +# +CONFIG_CPUFREQ_DT=y +# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set +# CONFIG_QORIQ_CPUFREQ is not set + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +# +# ARM CPU Idle Drivers +# +# CONFIG_ARM_CPUIDLE is not set +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y +# CONFIG_KERNEL_MODE_NEON is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_SCRIPT=y +# CONFIG_HAVE_AOUT is not set +# CONFIG_BINFMT_MISC is not set +CONFIG_COREDUMP=y + +# +# Power management options +# +# CONFIG_SUSPEND is not set +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +# CONFIG_APM_EMULATION is not set +CONFIG_PM_OPP=y +CONFIG_PM_CLK=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_CPU_PM=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARM_CPU_SUSPEND=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_NET=y +CONFIG_NET_INGRESS=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_DIAG is not set +CONFIG_UNIX=y +# CONFIG_UNIX_DIAG is not set +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_IP_FIB_TRIE_STATS is not set +CONFIG_IP_MULTIPLE_TABLES=y +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set +# CONFIG_IP_PNP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +# CONFIG_IP_MROUTE is not set +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_TCP_CONG_DCTCP is not set +# CONFIG_TCP_CONG_CDG is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=m +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +# CONFIG_IPV6_ILA is not set +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set +# CONFIG_IPV6_PIMSM_V2 is not set +# CONFIG_NETLABEL is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NET_PTP_CLASSIFY is not set +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +# CONFIG_NETFILTER_NETLINK_ACCT is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_PROCFS=y +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +CONFIG_NF_CT_PROTO_GRE=m +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=m +CONFIG_NETFILTER_SYNPROXY=m +# CONFIG_NF_TABLES is not set +CONFIG_NETFILTER_XTABLES=m + +# +# Xtables combined modules +# +# CONFIG_NETFILTER_XT_MARK is not set +# CONFIG_NETFILTER_XT_CONNMARK is not set + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_CT is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_HL=m +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set +# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set +CONFIG_NETFILTER_XT_TARGET_LED=m +# CONFIG_NETFILTER_XT_TARGET_LOG is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# +# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +CONFIG_NETFILTER_XT_MATCH_HL=m +# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +CONFIG_NETFILTER_XT_MATCH_MAC=m +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +# CONFIG_IP_SET is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +# CONFIG_IP_NF_SECURITY is not set +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +# CONFIG_IP6_NF_MATCH_RPFILTER is not set +CONFIG_IP6_NF_MATCH_RT=m +# CONFIG_IP6_NF_TARGET_HL is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +# CONFIG_IP6_NF_SECURITY is not set +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_L2TP=m +# CONFIG_L2TP_DEBUGFS is not set +# CONFIG_L2TP_V3 is not set +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +# CONFIG_BRIDGE_VLAN_FILTERING is not set +CONFIG_HAVE_NET_DSA=y +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_VLAN_8021Q_MVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=m +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_PHONET is not set +# CONFIG_6LOWPAN is not set +# CONFIG_IEEE802154 is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +# CONFIG_NET_SCH_PRIO is not set +# CONFIG_NET_SCH_MULTIQ is not set +CONFIG_NET_SCH_RED=m +# CONFIG_NET_SCH_SFB is not set +# CONFIG_NET_SCH_SFQ is not set +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +CONFIG_NET_SCH_NETEM=m +# CONFIG_NET_SCH_DRR is not set +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set +# CONFIG_NET_SCH_CODEL is not set +# CONFIG_NET_SCH_FQ_CODEL is not set +# CONFIG_NET_SCH_FQ is not set +# CONFIG_NET_SCH_HHF is not set +# CONFIG_NET_SCH_PIE is not set +# CONFIG_NET_SCH_PLUG is not set + +# +# Classification +# +CONFIG_NET_CLS=y +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +CONFIG_NET_CLS_FW=m +# CONFIG_NET_CLS_U32 is not set +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +CONFIG_NET_CLS_CGROUP=m +CONFIG_NET_CLS_BPF=m +# CONFIG_NET_CLS_FLOWER is not set +# CONFIG_NET_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +# CONFIG_DNS_RESOLVER is not set +# CONFIG_BATMAN_ADV is not set +# CONFIG_OPENVSWITCH is not set +# CONFIG_VSOCKETS is not set +# CONFIG_NETLINK_MMAP is not set +# CONFIG_NETLINK_DIAG is not set +# CONFIG_MPLS is not set +# CONFIG_HSR is not set +# CONFIG_NET_SWITCHDEV is not set +# CONFIG_NET_L3_MASTER_DEV is not set +# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_BPF_JIT=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_INTERNAL_REGDB is not set +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +# CONFIG_LIB80211 is not set +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +# CONFIG_MAC80211_RC_MINSTREL_VHT is not set +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +# CONFIG_MAC80211_MESH is not set +# CONFIG_MAC80211_LEDS is not set +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_RFKILL_REGULATOR is not set +# CONFIG_NET_9P is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set +# CONFIG_NFC is not set +# CONFIG_LWTUNNEL is not set +CONFIG_HAVE_BPF_JIT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER=y +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_FW_LOADER=m +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +# CONFIG_ALLOW_DEV_COREDUMP is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_SOC_BUS=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=m +# CONFIG_DMA_SHARED_BUFFER is not set + +# +# Bus devices +# +# CONFIG_BRCMSTB_GISB_ARB is not set +# CONFIG_IMX_WEIM is not set +# CONFIG_VEXPRESS_CONFIG is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set +CONFIG_MTD_OF_PARTS=m +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +# CONFIG_MTD_BLOCK is not set +# CONFIG_MTD_BLOCK_RO is not set +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +# CONFIG_MTD_SWAP is not set +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +CONFIG_MTD_M25P80=m +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLOCK2MTD=m + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOCG3 is not set +# CONFIG_MTD_NAND is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR & LPDDR2 PCM memory drivers +# +# CONFIG_MTD_LPDDR is not set +# CONFIG_MTD_LPDDR2_NVM is not set +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_SPI_FSL_QUADSPI is not set +# CONFIG_MTD_UBI is not set +CONFIG_DTC=y +CONFIG_OF=y +# CONFIG_OF_UNITTEST is not set +CONFIG_OF_FLATTREE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_NET=y +CONFIG_OF_MTD=y +CONFIG_OF_RESERVED_MEM=y +# CONFIG_OF_OVERLAY is not set +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_NULL_BLK is not set +# CONFIG_ZRAM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_DRBD is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +# CONFIG_BLK_DEV_RBD is not set + +# +# Misc devices +# +# CONFIG_SENSORS_LIS3LV02D is not set +# CONFIG_AD525X_DPOT is not set +# CONFIG_DUMMY_IRQ is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1780 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_BMP085_I2C is not set +# CONFIG_BMP085_SPI is not set +# CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_LATTICE_ECP3_CONFIG is not set +CONFIG_SRAM=y +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_TI_ST is not set +# CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set + +# +# Altera FPGA firmware download module +# +# CONFIG_ALTERA_STAPL is not set + +# +# Intel MIC Bus Driver +# + +# +# SCIF Bus Driver +# + +# +# Intel MIC Host Driver +# + +# +# Intel MIC Card Driver +# + +# +# SCIF Driver +# + +# +# Intel MIC Coprocessor State Management (COSM) Drivers +# +# CONFIG_ECHO is not set +# CONFIG_CXL_BASE is not set +# CONFIG_CXL_KERNEL_API is not set +# CONFIG_CXL_EEH is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_NETLINK is not set +# CONFIG_SCSI_MQ_DEFAULT is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_ISCSI_BOOT_SYSFS is not set +# CONFIG_SCSI_UFSHCD is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +# CONFIG_ATA is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +# CONFIG_BCACHE is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_MQ_DEFAULT is not set +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=y +CONFIG_DM_CRYPT=y +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_THIN_PROVISIONING is not set +# CONFIG_DM_CACHE is not set +# CONFIG_DM_ERA is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_RAID is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +# CONFIG_DM_FLAKEY is not set +CONFIG_DM_VERITY=y +# CONFIG_DM_SWITCH is not set +# CONFIG_DM_LOG_WRITES is not set +# CONFIG_TARGET_CORE is not set +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +# CONFIG_BONDING is not set +CONFIG_DUMMY=m +# CONFIG_EQUALIZER is not set +# CONFIG_NET_TEAM is not set +# CONFIG_MACVLAN is not set +# CONFIG_IPVLAN is not set +CONFIG_VXLAN=m +# CONFIG_GENEVE is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_TUN=m +# CONFIG_TUN_VNET_CROSS_LE is not set +CONFIG_VETH=m +# CONFIG_NLMON is not set + +# +# CAIF transport drivers +# + +# +# Distributed Switch Architecture drivers +# +# CONFIG_NET_DSA_MV88E6XXX is not set +# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set +# CONFIG_ETHERNET is not set +# CONFIG_PHYLIB is not set +# CONFIG_MICREL_KS8995MA is not set +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +# CONFIG_PPP_MULTILINK is not set +CONFIG_PPPOE=m +# CONFIG_PPTP is not set +CONFIG_PPPOL2TP=m +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m + +# +# Host-side USB support is needed for USB Network Adapter support +# +CONFIG_USB_NET_DRIVERS=m +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_RTL8152 is not set +# CONFIG_USB_LAN78XX is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_IPHETH is not set +CONFIG_WLAN=y +# CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_AT76C50X_USB is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_USB_NET_RNDIS_WLAN is not set +CONFIG_RTL8187=m +# CONFIG_MAC80211_HWSIM is not set +# CONFIG_ATH_CARDS is not set +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_BRCMSMAC is not set +# CONFIG_BRCMFMAC is not set +# CONFIG_HOSTAP is not set +# CONFIG_LIBERTAS is not set +# CONFIG_P54_COMMON is not set +CONFIG_RT2X00=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2X00_DEBUG=y +# CONFIG_WL_MEDIATEK is not set +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_USB=m +CONFIG_RTLWIFI_DEBUG=y +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8XXXU=m +# CONFIG_RTL8XXXU_UNTESTED is not set +# CONFIG_WL_TI is not set +# CONFIG_ZD1211RW is not set +# CONFIG_MWIFIEX is not set +# CONFIG_CW1200 is not set +# CONFIG_RSI_91X is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set +# CONFIG_ISDN is not set +# CONFIG_NVM is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=m +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set +# CONFIG_INPUT_SPARSEKMAP is not set +# CONFIG_INPUT_MATRIXKMAP is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ADP5589 is not set +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_QT1070 is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_GPIO is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_LM8333 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set +# CONFIG_KEYBOARD_IMX is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_SAMSUNG is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_BCM is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +# CONFIG_MOUSE_PS2_ALPS is not set +# CONFIG_MOUSE_PS2_LOGIPS2PP is not set +# CONFIG_MOUSE_PS2_SYNAPTICS is not set +# CONFIG_MOUSE_PS2_CYPRESS is not set +# CONFIG_MOUSE_PS2_TRACKPOINT is not set +# CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set +# CONFIG_MOUSE_PS2_TOUCHKIT is not set +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_SERIAL=m +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_CYAPA is not set +# CONFIG_MOUSE_ELAN_I2C is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set +CONFIG_MOUSE_SYNAPTICS_USB=m +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +# CONFIG_TOUCHSCREEN_AD7879 is not set +# CONFIG_TOUCHSCREEN_AR1021_I2C is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set +# CONFIG_TOUCHSCREEN_BU21013 is not set +# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set +# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set +# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set +# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set +# CONFIG_TOUCHSCREEN_DYNAPRO is not set +# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set +# CONFIG_TOUCHSCREEN_EETI is not set +# CONFIG_TOUCHSCREEN_EGALAX is not set +# CONFIG_TOUCHSCREEN_FT6236 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +# CONFIG_TOUCHSCREEN_GOODIX is not set +# CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELAN is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set +# CONFIG_TOUCHSCREEN_WACOM_I2C is not set +# CONFIG_TOUCHSCREEN_MAX11801 is not set +# CONFIG_TOUCHSCREEN_MCS5000 is not set +# CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set +# CONFIG_TOUCHSCREEN_INEXIO is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_PIXCIR is not set +# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +# CONFIG_TOUCHSCREEN_USB_EGALAX is not set +# CONFIG_TOUCHSCREEN_USB_PANJIT is not set +# CONFIG_TOUCHSCREEN_USB_3M is not set +# CONFIG_TOUCHSCREEN_USB_ITM is not set +# CONFIG_TOUCHSCREEN_USB_ETURBO is not set +# CONFIG_TOUCHSCREEN_USB_GUNZE is not set +# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set +# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set +# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set +# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set +# CONFIG_TOUCHSCREEN_USB_GOTOP is not set +# CONFIG_TOUCHSCREEN_USB_JASTEC is not set +# CONFIG_TOUCHSCREEN_USB_ELO is not set +CONFIG_TOUCHSCREEN_USB_E2I=y +# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set +# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set +# CONFIG_TOUCHSCREEN_USB_NEXIO is not set +# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set +# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set +# CONFIG_TOUCHSCREEN_TSC_SERIO is not set +# CONFIG_TOUCHSCREEN_TSC2004 is not set +# CONFIG_TOUCHSCREEN_TSC2005 is not set +# CONFIG_TOUCHSCREEN_TSC2007 is not set +# CONFIG_TOUCHSCREEN_ST1232 is not set +# CONFIG_TOUCHSCREEN_SX8654 is not set +# CONFIG_TOUCHSCREEN_TPS6507X is not set +# CONFIG_TOUCHSCREEN_ZFORCE is not set +# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO_ALTERA_PS2 is not set +# CONFIG_SERIO_PS2MULT is not set +# CONFIG_SERIO_ARC_PS2 is not set +# CONFIG_SERIO_APBPS2 is not set +# CONFIG_USERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_N_GSM is not set +# CONFIG_TRACE_SINK is not set +CONFIG_DEVMEM=y +CONFIG_DEVKMEM=y + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_SCCNXP is not set +# CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_BCM63XX is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_IFX6X60 is not set +# CONFIG_SERIAL_XILINX_PS_UART is not set +# CONFIG_SERIAL_ARC is not set +# CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set +# CONFIG_SERIAL_ST_ASC is not set +# CONFIG_SERIAL_STM32 is not set +# CONFIG_TTY_PRINTK is not set +# CONFIG_HVC_DCC is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +# CONFIG_XILLYBUS is not set + +# +# I2C support +# +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_CBUS_GPIO is not set +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_IMX=m +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_PXA_PCI is not set +# CONFIG_I2C_RK3X is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_DIOLAN_U2C is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_ROBOTFUZZ_OSIF is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_SLAVE is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_CADENCE is not set +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_IMX=m +# CONFIG_SPI_FSL_SPI is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_ROCKCHIP is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_ZYNQMP_GQSPI is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_SPIDEV=m +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_SPMI is not set +# CONFIG_HSI is not set + +# +# PPS support +# +CONFIG_PPS=y +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +# CONFIG_PPS_CLIENT_GPIO is not set + +# +# PPS generators support +# + +# +# PTP clock support +# +# CONFIG_PTP_1588_CLOCK is not set + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PINCTRL=y + +# +# Pin controllers +# +CONFIG_PINMUX=y +CONFIG_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +# CONFIG_PINCTRL_AMD is not set +# CONFIG_PINCTRL_SINGLE is not set +CONFIG_PINCTRL_IMX=y +CONFIG_PINCTRL_IMX53=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_OF_GPIO=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=y + +# +# Memory mapped GPIO drivers +# +# CONFIG_GPIO_74XX_MMIO is not set +# CONFIG_GPIO_ALTERA is not set +# CONFIG_GPIO_DWAPB is not set +# CONFIG_GPIO_EM is not set +CONFIG_GPIO_GENERIC_PLATFORM=y +# CONFIG_GPIO_GRGPIO is not set +CONFIG_GPIO_MXC=y +# CONFIG_GPIO_XILINX is not set +# CONFIG_GPIO_ZEVIO is not set +# CONFIG_GPIO_ZX is not set + +# +# I2C GPIO expanders +# +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set + +# +# MFD GPIO expanders +# + +# +# SPI GPIO expanders +# +# CONFIG_GPIO_74X164 is not set +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MC33880 is not set + +# +# SPI or I2C GPIO expanders +# +# CONFIG_GPIO_MCP23S08 is not set + +# +# USB GPIO expanders +# +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27XXX is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_MANAGER is not set +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_BQ24190 is not set +# CONFIG_CHARGER_BQ24257 is not set +# CONFIG_CHARGER_BQ24735 is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_CHARGER_RT9455 is not set +# CONFIG_POWER_RESET is not set +CONFIG_POWER_AVS=y +# CONFIG_HWMON is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_GPIO_WATCHDOG=m +# CONFIG_XILINX_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set +# CONFIG_DW_WATCHDOG is not set +# CONFIG_MAX63XX_WATCHDOG is not set +CONFIG_IMX2_WDT=m +# CONFIG_BCM7038_WDT is not set +# CONFIG_MEN_A21_WDT is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +# CONFIG_BCMA is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_ATMEL_FLEXCOM is not set +# CONFIG_MFD_ATMEL_HLCDC is not set +# CONFIG_MFD_BCM590XX is not set +# CONFIG_MFD_CROS_EC is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_MFD_DA9052_SPI is not set +# CONFIG_MFD_DLN2 is not set +# CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_MFD_HI6421_PMIC is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_MENF21BMC is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_VIPERBOARD is not set +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_PM8921_CORE is not set +# CONFIG_MFD_RTSX_USB is not set +# CONFIG_MFD_RK808 is not set +# CONFIG_MFD_RN5T618 is not set +# CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SKY81452 is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_SYSCON is not set +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP3943 is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65912 is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_ARIZONA_SPI is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8994 is not set +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_ACT8865 is not set +# CONFIG_REGULATOR_AD5398 is not set +# CONFIG_REGULATOR_DA9210 is not set +# CONFIG_REGULATOR_DA9211 is not set +# CONFIG_REGULATOR_FAN53555 is not set +# CONFIG_REGULATOR_GPIO is not set +# CONFIG_REGULATOR_ISL9305 is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_LP872X is not set +# CONFIG_REGULATOR_LP8755 is not set +CONFIG_REGULATOR_LTC3589=m +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_MAX8973 is not set +# CONFIG_REGULATOR_MT6311 is not set +# CONFIG_REGULATOR_PFUZE100 is not set +# CONFIG_REGULATOR_TPS51632 is not set +# CONFIG_REGULATOR_TPS62360 is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_TPS6524X is not set +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_DRM is not set + +# +# Frame buffer Devices +# +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +# CONFIG_VGASTATE is not set + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +# CONFIG_SOUND is not set + +# +# HID support +# +CONFIG_HID=y +# CONFIG_HID_BATTERY_STRENGTH is not set +# CONFIG_HIDRAW is not set +# CONFIG_UHID is not set +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_ACRUX is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_APPLEIR is not set +# CONFIG_HID_AUREAL is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_BETOP_FF is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_CHICONY is not set +# CONFIG_HID_CORSAIR is not set +# CONFIG_HID_CP2112 is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EMS_FF is not set +# CONFIG_HID_ELECOM is not set +# CONFIG_HID_ELO is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_GEMBIRD is not set +# CONFIG_HID_GFRM is not set +# CONFIG_HID_HOLTEK is not set +# CONFIG_HID_GT683R is not set +# CONFIG_HID_KEYTOUCH is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_UCLOGIC is not set +# CONFIG_HID_WALTOP is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_ICADE is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LCPOWER is not set +# CONFIG_HID_LENOVO is not set +# CONFIG_HID_LOGITECH is not set +# CONFIG_HID_MAGICMOUSE is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_HID_NTRIG is not set +# CONFIG_HID_ORTEK is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PENMOUNT is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_PICOLCD is not set +# CONFIG_HID_PLANTRONICS is not set +# CONFIG_HID_PRIMAX is not set +# CONFIG_HID_ROCCAT is not set +# CONFIG_HID_SAITEK is not set +# CONFIG_HID_SAMSUNG is not set +# CONFIG_HID_SONY is not set +# CONFIG_HID_SPEEDLINK is not set +# CONFIG_HID_STEELSERIES is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_RMI is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TIVO is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_THINGM is not set +# CONFIG_HID_THRUSTMASTER is not set +# CONFIG_HID_WACOM is not set +# CONFIG_HID_WIIMOTE is not set +# CONFIG_HID_XINMO is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +# CONFIG_HID_SENSOR_HUB is not set + +# +# USB HID support +# +CONFIG_USB_HID=m +# CONFIG_HID_PID is not set +CONFIG_USB_HIDDEV=y + +# +# USB HID Boot Protocol drivers +# +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m + +# +# I2C HID support +# +# CONFIG_I2C_HID is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +# CONFIG_USB_DYNAMIC_MINORS is not set +CONFIG_USB_OTG=y +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_OTG_FSM is not set +# CONFIG_USB_ULPI_BUS is not set +# CONFIG_USB_MON is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +# CONFIG_USB_EHCI_MXC is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_FOTG210_HCD is not set +# CONFIG_USB_MAX3421_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_IMX21_HCD is not set +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_REALTEK is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_STORAGE_ENE_UB6250 is not set +# CONFIG_USB_UAS is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USBIP_CORE is not set +# CONFIG_USB_MUSB_HDRC is not set +# CONFIG_USB_DWC3 is not set +# CONFIG_USB_DWC2 is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_OF=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_DEBUG=y +# CONFIG_USB_ISP1760 is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_EHSET_TEST_FIXTURE is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_YUREX is not set +# CONFIG_USB_EZUSB_FX2 is not set +# CONFIG_USB_HSIC_USB3503 is not set +# CONFIG_USB_LINK_LAYER_TEST is not set +# CONFIG_USB_CHAOSKEY is not set + +# +# USB Physical Layer drivers +# +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=y +# CONFIG_AM335X_PHY_USB is not set +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ISP1301 is not set +# CONFIG_USB_MXS_PHY is not set +# CONFIG_USB_ULPI is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_DEBUG_FS=y +CONFIG_USB_GADGET_VBUS_DRAW=500 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 + +# +# USB Peripheral Controller +# +# CONFIG_USB_FSL_USB2 is not set +# CONFIG_USB_FUSB300 is not set +# CONFIG_USB_FOTG210_UDC is not set +# CONFIG_USB_GR_UDC is not set +# CONFIG_USB_R8A66597 is not set +# CONFIG_USB_PXA27X is not set +# CONFIG_USB_MV_UDC is not set +# CONFIG_USB_MV_U3D is not set +# CONFIG_USB_M66592 is not set +# CONFIG_USB_BDC_UDC is not set +# CONFIG_USB_NET2272 is not set +# CONFIG_USB_GADGET_XILINX is not set +# CONFIG_USB_DUMMY_HCD is not set +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_F_SS_LB=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +CONFIG_USB_ZERO=m +# CONFIG_USB_ZERO_HNPTEST is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_G_ACM_MS=m +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +CONFIG_USB_G_MULTI_CDC=y +CONFIG_USB_G_HID=m +# CONFIG_USB_G_DBGP is not set +# CONFIG_USB_LED_TRIG is not set +# CONFIG_UWB is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set + +# +# MMC/SD/SDIO Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_IO_ACCESSORS=y +CONFIG_MMC_SDHCI_PLTFM=y +# CONFIG_MMC_SDHCI_OF_ARASAN is not set +# CONFIG_MMC_SDHCI_OF_AT91 is not set +# CONFIG_MMC_SDHCI_OF_ESDHC is not set +CONFIG_MMC_SDHCI_ESDHC_IMX=y +# CONFIG_MMC_SDHCI_F_SDH30 is not set +# CONFIG_MMC_MXC is not set +# CONFIG_MMC_SPI is not set +# CONFIG_MMC_DW is not set +# CONFIG_MMC_VUB300 is not set +# CONFIG_MMC_USHC is not set +# CONFIG_MMC_USDHI6ROL0 is not set +# CONFIG_MMC_MTK is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m +# CONFIG_LEDS_CLASS_FLASH is not set + +# +# LED drivers +# +# CONFIG_LEDS_BCM6328 is not set +# CONFIG_LEDS_BCM6358 is not set +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3642 is not set +# CONFIG_LEDS_PCA9532 is not set +CONFIG_LEDS_GPIO=m +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_LP5521 is not set +# CONFIG_LEDS_LP5523 is not set +# CONFIG_LEDS_LP5562 is not set +# CONFIG_LEDS_LP8501 is not set +# CONFIG_LEDS_LP8860 is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_LT3593 is not set +# CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_TLC591XX is not set +# CONFIG_LEDS_LM355x is not set + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +# CONFIG_LEDS_BLINKM is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +# CONFIG_LEDS_TRIGGER_CAMERA is not set +# CONFIG_ACCESSIBILITY is not set +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_ABB5ZES3 is not set +# CONFIG_RTC_DRV_ABX80X is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_ISL12057 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF2127 is not set +# CONFIG_RTC_DRV_PCF8523 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set +# CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV3029C2 is not set +# CONFIG_RTC_DRV_RV8803 is not set + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1343 is not set +# CONFIG_RTC_DRV_DS1347 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set +# CONFIG_RTC_DRV_MCP795 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1685_FAMILY is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_DS2404 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_V3020 is not set +# CONFIG_RTC_DRV_ZYNQMP is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_IMXDI=y +CONFIG_RTC_DRV_MXC=y +# CONFIG_RTC_DRV_SNVS is not set + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y +# CONFIG_FSL_EDMA is not set +# CONFIG_IMX_DMA is not set +CONFIG_IMX_SDMA=m +# CONFIG_INTEL_IDMA64 is not set +# CONFIG_MX3_IPU is not set +# CONFIG_NBPFAXI_DMA is not set +# CONFIG_DW_DMAC is not set + +# +# DMA Clients +# +# CONFIG_ASYNC_TX_DMA is not set +# CONFIG_DMATEST is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set +# CONFIG_VIRT_DRIVERS is not set + +# +# Virtio drivers +# +# CONFIG_VIRTIO_MMIO is not set + +# +# Microsoft Hyper-V guest support +# +# CONFIG_STAGING is not set +# CONFIG_CHROME_PLATFORMS is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI514 is not set +# CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_CDCE925 is not set +# CONFIG_CLK_QORIQ is not set +# CONFIG_COMMON_CLK_PXA is not set +# CONFIG_COMMON_CLK_CDCE706 is not set + +# +# Hardware Spinlock drivers +# + +# +# Clock Source drivers +# +CONFIG_CLKSRC_OF=y +CONFIG_CLKSRC_PROBE=y +CONFIG_CLKSRC_MMIO=y +# CONFIG_ARM_TIMER_SP804 is not set +# CONFIG_ATMEL_PIT is not set +# CONFIG_SH_TIMER_CMT is not set +# CONFIG_SH_TIMER_MTU2 is not set +# CONFIG_SH_TIMER_TMU is not set +# CONFIG_EM_TIMER_STI is not set +CONFIG_CLKSRC_IMX_GPT=y +# CONFIG_MAILBOX is not set +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set +# CONFIG_ARM_SMMU is not set + +# +# Remoteproc drivers +# +# CONFIG_STE_MODEM_RPROC is not set + +# +# Rpmsg drivers +# + +# +# SOC (System On Chip) specific Drivers +# +# CONFIG_SOC_BRCMSTB is not set +# CONFIG_SUNXI_SRAM is not set +# CONFIG_SOC_TI is not set +# CONFIG_PM_DEVFREQ is not set +CONFIG_EXTCON=m + +# +# Extcon Device Drivers +# +# CONFIG_EXTCON_GPIO is not set +# CONFIG_EXTCON_RT8973A is not set +# CONFIG_EXTCON_SM5502 is not set +# CONFIG_EXTCON_USB_GPIO is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set +# CONFIG_PWM is not set +CONFIG_IRQCHIP=y +# CONFIG_IPACK_BUS is not set +CONFIG_ARCH_HAS_RESET_CONTROLLER=y +# CONFIG_RESET_CONTROLLER is not set +# CONFIG_FMC is not set + +# +# PHY Subsystem +# +# CONFIG_GENERIC_PHY is not set +# CONFIG_PHY_PXA_28NM_HSIC is not set +# CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_BCM_KONA_USB2_PHY is not set +# CONFIG_POWERCAP is not set +# CONFIG_MCB is not set + +# +# Performance monitor support +# +# CONFIG_RAS is not set + +# +# Android +# +# CONFIG_ANDROID is not set +# CONFIG_NVMEM is not set +# CONFIG_STM is not set +# CONFIG_STM_DUMMY is not set +# CONFIG_STM_SOURCE_CONSOLE is not set +# CONFIG_INTEL_TH is not set + +# +# FPGA Configuration Support +# +# CONFIG_FPGA is not set + +# +# Firmware Drivers +# +# CONFIG_FIRMWARE_MEMMAP is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_ENCRYPTION is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_F2FS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_FANOTIFY is not set +# CONFIG_QUOTA is not set +# CONFIG_QUOTACTL is not set +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +# CONFIG_CUSE is not set +CONFIG_OVERLAY_FS=y + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +CONFIG_NTFS_RW=y + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PROC_CHILDREN is not set +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=y +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +CONFIG_ECRYPT_FS=m +CONFIG_ECRYPT_FS_MESSAGING=y +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +# CONFIG_JFFS2_LZO is not set +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +# CONFIG_LOGFS is not set +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_DECOMP_MULTI is not set +# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set +# CONFIG_SQUASHFS_XATTR is not set +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +# CONFIG_SQUASHFS_LZO is not set +# CONFIG_SQUASHFS_XZ is not set +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +# CONFIG_PSTORE is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_SWAP is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +# CONFIG_SUNRPC_DEBUG is not set +# CONFIG_CEPH_FS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_UPCALL is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG is not set +# CONFIG_CIFS_DFS_UPCALL is not set +# CONFIG_CIFS_SMB2 is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set +CONFIG_NLS_UTF8=y +# CONFIG_DLM is not set + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +# CONFIG_PRINTK_TIME is not set +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_DYNAMIC_DEBUG is not set + +# +# Compile-time checks and compiler options +# +# CONFIG_DEBUG_INFO is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_PAGE_OWNER is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_DEBUG_KERNEL=y + +# +# Memory Debugging +# +# CONFIG_PAGE_EXTENSION is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_STATS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_MEMORY_INIT is not set +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Lockups and Hangs +# +CONFIG_LOCKUP_DETECTOR=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=0 +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1 +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=5 +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHED_INFO is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_SCHED_STACK_END_CHECK is not set +# CONFIG_DEBUG_TIMEKEEPING is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_PREEMPT is not set + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +# CONFIG_STACKTRACE is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PI_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_TORTURE_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set + +# +# Runtime Testing +# +CONFIG_LKDTM=m +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PERCPU_TEST is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_TEST_HEXDUMP is not set +# CONFIG_TEST_STRING_HELPERS is not set +# CONFIG_TEST_KSTRTOX is not set +# CONFIG_TEST_PRINTF is not set +# CONFIG_TEST_RHASHTABLE is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_TEST_LKM is not set +# CONFIG_TEST_USER_COPY is not set +# CONFIG_TEST_BPF is not set +# CONFIG_TEST_FIRMWARE is not set +# CONFIG_TEST_UDELAY is not set +# CONFIG_MEMTEST is not set +# CONFIG_TEST_STATIC_KEYS is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_ARM_PTDUMP is not set +CONFIG_STRICT_DEVMEM=y +CONFIG_ARM_UNWIND=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_LL is not set +CONFIG_DEBUG_IMX_UART_PORT=1 +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +# CONFIG_DEBUG_UART_8250 is not set +# CONFIG_DEBUG_UART_BCM63XX is not set +CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_DEBUG_SET_MODULE_RONX is not set +# CONFIG_CORESIGHT is not set + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set +CONFIG_ENCRYPTED_KEYS=m +# CONFIG_SECURITY_DMESG_RESTRICT is not set +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +# CONFIG_SECURITY_NETWORK is not set +# CONFIG_SECURITY_PATH is not set +# CONFIG_SECURITY_SMACK is not set +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_SECURITY_APPARMOR is not set +# CONFIG_SECURITY_YAMA is not set +CONFIG_INTEGRITY=y +# CONFIG_INTEGRITY_SIGNATURE is not set +# CONFIG_IMA is not set +# CONFIG_EVM is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=m +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_AKCIPHER2=y +# CONFIG_CRYPTO_RSA is not set +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_MCRYPTD is not set +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=m +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=y +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +CONFIG_CRYPTO_XTS=y +# CONFIG_CRYPTO_KEYWRAP is not set + +# +# Hash modes +# +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=m +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_CRC32 is not set +# CONFIG_CRYPTO_CRCT10DIF is not set +CONFIG_CRYPTO_GHASH=m +# CONFIG_CRYPTO_POLY1305 is not set +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=y +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=m +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_CHACHA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=m +# CONFIG_CRYPTO_842 is not set +# CONFIG_CRYPTO_LZ4 is not set +# CONFIG_CRYPTO_LZ4HC is not set + +# +# Random Number Generation +# +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_JITTERENTROPY=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +# CONFIG_CRYPTO_USER_API_AEAD is not set +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_FSL_CAAM is not set +CONFIG_CRYPTO_DEV_SAHARA=y +# CONFIG_CRYPTO_DEV_MXS_DCP is not set +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m +CONFIG_PKCS7_MESSAGE_PARSER=m +# CONFIG_PKCS7_TEST_KEY is not set + +# +# Certificates for signature checking +# +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set +# CONFIG_ARM_CRYPTO is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=y +# CONFIG_CRC_T10DIF is not set +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +# CONFIG_CRC7 is not set +# CONFIG_LIBCRC32C is not set +# CONFIG_CRC8 is not set +# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_DECOMPRESS=y +# CONFIG_XZ_DEC is not set +# CONFIG_XZ_DEC_BCJ is not set +CONFIG_DECOMPRESS_GZIP=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_DQL=y +CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_CLZ_TAB=y +# CONFIG_CORDIC is not set +# CONFIG_DDR is not set +CONFIG_MPILIB=m +CONFIG_LIBFDT=y +CONFIG_OID_REGISTRY=m +# CONFIG_SG_SPLIT is not set +CONFIG_ARCH_HAS_SG_CHAIN=y +# CONFIG_VIRTUALIZATION is not set diff --git a/usbarmory/usbarmory_dts.patch b/usbarmory/usbarmory_dts.patch new file mode 100644 index 000000000000..e29c6dd331db --- /dev/null +++ b/usbarmory/usbarmory_dts.patch @@ -0,0 +1,418 @@ +diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-common.dtsi linux-4.4/arch/arm/boot/dts/imx53-usbarmory-common.dtsi +--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-common.dtsi 1969-12-31 18:00:00.000000000 -0600 ++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-common.dtsi 2016-02-04 08:31:38.730794858 -0600 +@@ -0,0 +1,241 @@ ++/* ++ * USB armory MkI device tree include file ++ * https://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * Licensed under GPLv2 ++ */ ++ ++#include "imx53.dtsi" ++ ++/ { ++ model = "Inverse Path USB armory"; ++ compatible = "inversepath,imx53-usbarmory", "fsl,imx53"; ++}; ++ ++/ { ++ chosen { ++ stdout-path = &uart1; ++ }; ++ ++ memory { ++ reg = <0x70000000 0x20000000>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&led_pin_gpio4_27>; ++ ++ user { ++ label = "LED"; ++ gpios = <&gpio4 27 0>; ++ linux,default-trigger = "heartbeat"; ++ }; ++ }; ++ ++ soc { ++ aips@60000000 { ++ sahara: crypto@63ff8000 { ++ compatible = "fsl,imx53-sahara"; ++ reg = <0x63ff8000 0x4000>; ++ interrupts = <19 20>; ++ clocks = <&clks IMX5_CLK_SAHARA_IPG_GATE>, ++ <&clks IMX5_CLK_SAHARA_IPG_GATE>; ++ clock-names = "ipg", "ahb"; ++ }; ++ }; ++ }; ++}; ++ ++&cpu0 { ++ device_type = "cpu"; ++ compatible = "arm,cortex-a8"; ++ reg = <0x0>; ++ clocks = <&clks IMX5_CLK_ARM>; ++ clock-latency = <61036>; ++ voltage-tolerance = <5>; ++ operating-points = < ++ /* kHz */ ++ 166666 850000 ++ 400000 900000 ++ 800000 1050000 ++ >; ++}; ++ ++&esdhc1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_esdhc1>; ++ status = "okay"; ++}; ++ ++&iomuxc { ++ pinctrl-names = "default"; ++ ++ imx53-usbarmory { ++ led_pin_gpio4_27: led_gpio4_27@0 { ++ fsl,pins = < ++ MX53_PAD_DISP0_DAT6__GPIO4_27 0x80000000 ++ >; ++ }; ++ ++ pinctrl_esdhc1: esdhc1grp { ++ fsl,pins = < ++ MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5 ++ MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5 ++ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5 ++ MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5 ++ MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5 ++ MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5 ++ >; ++ }; ++ ++ pinctrl_i2c1_pmic: i2c1grp_pmic { ++ fsl,pins = < ++ MX53_PAD_EIM_D21__I2C1_SCL 0xc0000000 ++ MX53_PAD_EIM_D28__I2C1_SDA 0xc0000000 ++ >; ++ }; ++ ++ /* ++ UART mode pin header configration: ++ pin number: 1 2 3 4 5 6 7 ++ function: GND 5V ? ? TX RX ? ++ */ ++ pinctrl_uart1: uart1grp { ++ fsl,pins = < ++ MX53_PAD_CSI0_DAT10__UART1_TXD_MUX 0x1e4 ++ MX53_PAD_CSI0_DAT11__UART1_RXD_MUX 0x1e4 ++ >; ++ }; ++ ++ /* ++ GPIO mode pin header configuration: ++ 1 2 3 4 5 6 7 ++ GND 5V GPIO5[26] GPIO5[27] GPIO5[28] GPIO5[29] GPIO5[30] ++ */ ++ pinctrl_gpio5: gpio5grp { ++ fsl,pins = < ++ MX53_PAD_CSI0_DAT8__GPIO5_26 0xc0 ++ MX53_PAD_CSI0_DAT9__GPIO5_27 0xc0 ++ MX53_PAD_CSI0_DAT10__GPIO5_28 0xc0 ++ MX53_PAD_CSI0_DAT11__GPIO5_29 0xc0 ++ MX53_PAD_CSI0_DAT12__GPIO5_30 0xc0 ++ >; ++ }; ++ ++ /* ++ SPI mode pin header configuration: ++ 1 2 3 4 5 6 7 ++ GND 5V SCLK MOSI MISO /SS0 /SS1 ++ */ ++ pinctrl_ecspi2: ecspi2grp { ++ fsl,pins = < ++ MX53_PAD_CSI0_DAT8__ECSPI2_SCLK 0x80000000 ++ MX53_PAD_CSI0_DAT9__ECSPI2_MOSI 0x80000000 ++ MX53_PAD_CSI0_DAT10__ECSPI2_MISO 0x80000000 ++ MX53_PAD_CSI0_DAT11__GPIO5_29 0x80000000 ++ MX53_PAD_CSI0_DAT12__GPIO5_30 0x80000000 ++ >; ++ }; ++ ++ /* ++ I2C mode pin header configuration: ++ 1 2 3 4 5 6 7 ++ GND 5V SDA SCL GPIO5[28] GPIO5[29] GPIO5[30] ++ */ ++ pinctrl_i2c1_pinheader: i2c1grp_pinheader { ++ fsl,pins = < ++ MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000 ++ MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000 ++ MX53_PAD_CSI0_DAT10__GPIO5_28 0x80000000 ++ MX53_PAD_CSI0_DAT11__GPIO5_29 0x80000000 ++ MX53_PAD_CSI0_DAT12__GPIO5_30 0x80000000 ++ >; ++ }; ++ }; ++}; ++ ++&uart1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_uart1>; ++ status = "okay"; ++}; ++ ++&vpu { ++ status = "okay"; ++}; ++ ++&i2c1 { ++ pinctrl-0 = <&pinctrl_i2c1_pmic>; ++ status = "okay"; ++ ltc3589: pmic@34 { ++ compatible = "lltc,ltc3589-2"; ++ reg = <0x34>; ++ regulators { ++ sw1_reg: sw1 { ++ regulator-min-microvolt = <591930>; ++ regulator-max-microvolt = <1224671>; ++ lltc,fb-voltage-divider = <100000 158000>; ++ regulator-ramp-delay = <7000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ sw2_reg: sw2 { ++ regulator-min-microvolt = <704123>; ++ regulator-max-microvolt = <1456803>; ++ lltc,fb-voltage-divider = <180000 191000>; ++ regulator-ramp-delay = <7000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ sw3_reg: sw3 { ++ regulator-min-microvolt = <1341250>; ++ regulator-max-microvolt = <2775000>; ++ lltc,fb-voltage-divider = <270000 100000>; ++ regulator-ramp-delay = <7000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ bb_out_reg: bb-out { ++ regulator-min-microvolt = <3387341>; ++ regulator-max-microvolt = <3387341>; ++ lltc,fb-voltage-divider = <511000 158000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ldo1_reg: ldo1 { ++ regulator-min-microvolt = <1306329>; ++ regulator-max-microvolt = <1306329>; ++ lltc,fb-voltage-divider = <100000 158000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ ldo2_reg: ldo2 { ++ regulator-min-microvolt = <704123>; ++ regulator-max-microvolt = <1456806>; ++ lltc,fb-voltage-divider = <180000 191000>; ++ regulator-ramp-delay = <7000>; ++ regulator-boot-on; ++ regulator-always-on; ++ }; ++ ++ ldo3_reg: ldo3 { ++ regulator-min-microvolt = <2800000>; ++ regulator-max-microvolt = <2800000>; ++ regulator-boot-on; ++ }; ++ ++ ldo4_reg: ldo4 { ++ regulator-min-microvolt = <1200000>; ++ regulator-max-microvolt = <3200000>; ++ }; ++ }; ++ }; ++}; +diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory.dts +--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory.dts 2016-02-04 08:31:38.730794858 -0600 +@@ -0,0 +1,18 @@ ++/* ++ * USB armory MkI device mode device tree file ++ * https://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * Licensed under GPLv2 ++ */ ++ ++/dts-v1/; ++ ++#include "imx53-usbarmory-common.dtsi" ++ ++&usbotg { ++ dr_mode = "peripheral"; ++ status = "okay"; ++}; +diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-gpio.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-gpio.dts +--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-gpio.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-gpio.dts 2016-02-04 08:31:38.730794858 -0600 +@@ -0,0 +1,26 @@ ++/* ++ * USB armory MkI device mode device tree file ++ * https://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * Licensed under GPLv2 ++ */ ++ ++/dts-v1/; ++ ++#include "imx53-usbarmory-common.dtsi" ++ ++&usbotg { ++ dr_mode = "peripheral"; ++ status = "okay"; ++}; ++ ++&iomuxc { ++ pinctrl-0 = <&pinctrl_gpio5>; ++}; ++ ++&uart1 { ++ status = "disabled"; ++}; +diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-host.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-host.dts +--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-host.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-host.dts 2016-02-04 08:31:38.730794858 -0600 +@@ -0,0 +1,18 @@ ++/* ++ * USB armory MkI host mode device tree file ++ * https://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * Licensed under GPLv2 ++ */ ++ ++/dts-v1/; ++ ++#include "imx53-usbarmory-common.dtsi" ++ ++&usbotg { ++ dr_mode = "host"; ++ status = "okay"; ++}; +diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-i2c.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-i2c.dts +--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-i2c.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-i2c.dts 2016-02-04 08:31:38.730794858 -0600 +@@ -0,0 +1,32 @@ ++/* ++ * USB armory MkI device mode device tree file ++ * https://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * Licensed under GPLv2 ++ */ ++ ++/dts-v1/; ++ ++#include "imx53-usbarmory-common.dtsi" ++ ++&usbotg { ++ dr_mode = "peripheral"; ++ status = "okay"; ++}; ++ ++&uart1 { ++ status = "disabled"; ++}; ++ ++&iomuxc { ++ pinctrl-0 = <&pinctrl_i2c1_pinheader>; ++}; ++ ++&i2c1 { ++ ltc3589: pmic@34 { ++ status = "disabled"; ++ }; ++}; +diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-spi.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-spi.dts +--- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-spi.dts 1969-12-31 18:00:00.000000000 -0600 ++++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-spi.dts 2016-02-04 08:31:38.730794858 -0600 +@@ -0,0 +1,45 @@ ++/* ++ * USB armory MkI device mode device tree file ++ * https://inversepath.com/usbarmory ++ * ++ * Copyright (C) 2015, Inverse Path ++ * Andrej Rosano ++ * ++ * Licensed under GPLv2 ++ */ ++ ++/dts-v1/; ++ ++#include "imx53-usbarmory-common.dtsi" ++ ++&usbotg { ++ dr_mode = "peripheral"; ++ status = "okay"; ++}; ++ ++&uart1 { ++ status = "disabled"; ++}; ++ ++&iomuxc { ++ pinctrl-0 = <&pinctrl_ecspi2>; ++}; ++ ++&ecspi2 { ++ fsl,spi-num-chipselects = <2>; ++ cs-gpios = <&gpio5 29 0>, <&gpio5 30 0>; ++ status = "okay"; ++ ++ flash: m25p40@0 { ++ #address-cells = <1>; ++ #size-cells = <1>; ++ compatible = "st,m25p40", "st,m25p"; ++ spi-max-frequency = <20000000>; ++ reg = <0>; ++ ++ partition@0 { ++ label = "test-partition"; ++ reg = <0x0 0x80000>; ++ }; ++ }; ++}; +diff -Nru linux-4.4-orig/arch/arm/boot/dts/Makefile linux-4.4/arch/arm/boot/dts/Makefile +--- linux-4.4-orig/arch/arm/boot/dts/Makefile 2016-02-04 13:29:20.880919101 -0600 ++++ linux-4.4/arch/arm/boot/dts/Makefile 2016-02-04 13:27:10.733849955 -0600 +@@ -278,6 +278,10 @@ + imx53-smd.dtb \ + imx53-tx53-x03x.dtb \ + imx53-tx53-x13x.dtb \ ++ imx53-usbarmory.dtb \ ++ imx53-usbarmory-host.dtb \ ++ imx53-usbarmory-i2c.dtb \ ++ imx53-usbarmory-gpio.dtb \ + imx53-voipac-bsb.dtb + dtb-$(CONFIG_SOC_IMX6Q) += \ + imx6dl-apf6dev.dtb \ From 576f0cc4a291448c2fcd1b70126e2b1308d18db9 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 10 Feb 2016 18:38:03 +0100 Subject: [PATCH 007/624] update README --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8d70cb0926c5..98ae40844e7e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ A collection of NixOS modules covering hardware quirks. -Modules should favor usability and stability, so performance hacks -should be activated by an additional a NixOS option or conservative -and performance configs can be declared in seperate modules. - ## Usage The simplest way to use this repo for now is to clone locally and include by path: ``` nix @@ -13,4 +9,11 @@ The simplest way to use this repo for now is to clone locally and include by pat imports = [ /home/user/nixos-hardware/acme/thunkpad-2000.nix ]; } -''' +``` + +Modules should favor usability and stability, so performance hacks +should be activated by an additional a NixOS option or conservative +and performance configs can be declared in seperate modules. + +Because modules can only be tested with the appropriate hardware, +quality assurance is up to **you**. From 830b24384e4e1e0bd5f586bbfcb9e9d28ec0a233 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Feb 2016 21:50:07 +0100 Subject: [PATCH 008/624] Add power-saving configuration for Lenovo T410. --- lenovo/t410.nix | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 lenovo/t410.nix diff --git a/lenovo/t410.nix b/lenovo/t410.nix new file mode 100644 index 000000000000..81fd1fcac88d --- /dev/null +++ b/lenovo/t410.nix @@ -0,0 +1,77 @@ +{ config, pkgs, ... }: + + boot = { + kernelParams = [ + # Kernel GPU Savings Options (NOTE i915 chipset only) + "drm.debug=0" "drm.vblankoffdelay=1" "i915.semaphores=1" "i915.modeset=1" + "i915.use_mmio_flip=1" "i915.powersave=1" "i915.enable_ips=1" + "i915.disable_power_well=1" "i915.enable_hangcheck=1" + "i915.enable_cmd_parser=1" "i915.fastboot=0" "i915.enable_ppgtt=1" + "i915.reset=0" "i915.lvds_use_ssc=0" "i915.enable_psr=0" "vblank_mode=0" + "i915.i915_enable_rc6=1" + ]; + blacklistedKernelModules = [ + # Kernel GPU Savings Options (NOTE i915 chipset only) + "sierra_net" "cdc_mbim" "cdc_ncm" "btusb" + ]; + }; + + hardware.cpu.intel.updateMicrocode = true; + + systemd.services.tune-powermanagement = { + description = "Tune Powermanagement"; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + wantedBy = [ "multi-user.target" ]; + unitConfig.RequiresMountsFor = "/sys"; + script = '' + echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs' + echo '1' > '/sys/module/snd_hda_intel/parameters/power_save' + echo 'auto' > '/sys/bus/i2c/devices/i2c-0/device/power/control' + echo 'auto' > '/sys/bus/i2c/devices/i2c-1/device/power/control' + echo 'auto' > '/sys/bus/i2c/devices/i2c-2/device/power/control' + echo 'auto' > '/sys/bus/i2c/devices/i2c-3/device/power/control' + echo 'auto' > '/sys/bus/i2c/devices/i2c-4/device/power/control' + echo 'auto' > '/sys/bus/i2c/devices/i2c-5/device/power/control' + echo 'auto' > '/sys/bus/i2c/devices/i2c-6/device/power/control' + echo 'auto' > '/sys/bus/i2c/devices/i2c-7/device/power/control' + echo 'auto' > '/sys/bus/i2c/devices/i2c-8/device/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:00.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:02.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:16.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:16.3/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:19.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1a.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1b.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.1/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.3/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.4/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1d.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1e.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.2/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.3/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.6/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:03:00.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:0d:00.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:0d:00.1/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:ff:00.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:ff:00.1/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:ff:02.0/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:ff:02.1/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:ff:02.2/power/control' + echo 'auto' > '/sys/bus/pci/devices/0000:ff:02.3/power/control' + echo 'auto' > '/sys/bus/usb/devices/1-1.3/power/control' + echo 'min_power' > '/sys/class/scsi_host/host0/link_power_management_policy' + echo 'min_power' > '/sys/class/scsi_host/host1/link_power_management_policy' + echo 'min_power' > '/sys/class/scsi_host/host2/link_power_management_policy' + echo 'min_power' > '/sys/class/scsi_host/host3/link_power_management_policy' + echo 'min_power' > '/sys/class/scsi_host/host4/link_power_management_policy' + echo 'min_power' > '/sys/class/scsi_host/host5/link_power_management_policy' + /run/current-system/sw/bin/rmmod e1000e || true + ''; + # ${pkgs.ethtool}/bin/ethtool -s enp0s25 wol d || true + }; + +} From 8bf98661f4bdf63568ecf27afd205c6d8fe4602b Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 23 Feb 2016 18:32:53 +0100 Subject: [PATCH 009/624] add hardware-notes module for documentation Fixes #3 --- lib/hardware-notes.nix | 45 ++++++++++++++++++++++++++++++++++++++ supermicro/a1sri-2758f.nix | 20 ++++++++++++++--- 2 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 lib/hardware-notes.nix diff --git a/lib/hardware-notes.nix b/lib/hardware-notes.nix new file mode 100644 index 000000000000..4414ea3914e0 --- /dev/null +++ b/lib/hardware-notes.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + # use tail recursion to prevent whitespace padding + mkLog = list: + let + head = builtins.head list; + tail = builtins.tail list; + in + '' + # ${head.title} + ${head.text}${if tail == [] then "" else "\n\n${mkLog tail}"} + ''; +in + +{ + + options = { + hardwareNotes = mkOption { + internal = true; + type = types.listOf types.optionSet; + options = { + title = mkOption { + type = types.str; + example = "Thunkpad-2000: increase self-destruct timeout"; + }; + text = mkOption { + type = types.str; + example = + '' + Increase security timeout at boot using platform managment + tool to prevent premature data loss. + ''; + }; + }; + }; + }; + + config = { + environment.etc."hardware-notes".text = mkLog config.hardwareNotes; + }; + +} diff --git a/supermicro/a1sri-2758f.nix b/supermicro/a1sri-2758f.nix index 3471704467f9..b199bf16b568 100644 --- a/supermicro/a1sri-2758f.nix +++ b/supermicro/a1sri-2758f.nix @@ -6,11 +6,25 @@ { pkgs, ... }: { + imports = [ ../lib/hardware-notes.nix ]; + environment.systemPackages = [ pkgs.ipmitool ]; boot.kernelModules = [ "ipmi_devintf" "ipmi_si" ]; - # The Linux NIC driver seems to have faulty link state reporting - # that causes dhcpcd to release every few seconds, which is - # more annoying than not releasing when a cable is unplugged. networking.dhcpcd.extraConfig = "nolink"; + + hardwareNotes = + [ { title = "IPMI"; + text = "Load IPMI kernel modules and ipmitool to system environment."; + } + { title = "Nolink"; + text = + '' + Interface link state detection is disabled in dhcpcd because + the Linux driver seems to send erronous loss of link messages + that cause dhcpcd to release every few seconds, which is + more annoying than not releasing when a cable is unplugged. + ''; + } + ]; } From 13a1d5c0bdb22fc69774131c606c07a9272227fa Mon Sep 17 00:00:00 2001 From: Emery Date: Tue, 23 Feb 2016 19:19:18 +0100 Subject: [PATCH 010/624] usbarmory: move to /inversepath, host support --- .../usbarmory}/configuration.nix | 0 .../usbarmory}/customKernel.config | 0 inversepath/usbarmory/host.nix | 35 +++++++++++++++++++ .../usbarmory}/usbarmory_dts.patch | 0 4 files changed, 35 insertions(+) rename {usbarmory => inversepath/usbarmory}/configuration.nix (100%) rename {usbarmory => inversepath/usbarmory}/customKernel.config (100%) create mode 100644 inversepath/usbarmory/host.nix rename {usbarmory => inversepath/usbarmory}/usbarmory_dts.patch (100%) diff --git a/usbarmory/configuration.nix b/inversepath/usbarmory/configuration.nix similarity index 100% rename from usbarmory/configuration.nix rename to inversepath/usbarmory/configuration.nix diff --git a/usbarmory/customKernel.config b/inversepath/usbarmory/customKernel.config similarity index 100% rename from usbarmory/customKernel.config rename to inversepath/usbarmory/customKernel.config diff --git a/inversepath/usbarmory/host.nix b/inversepath/usbarmory/host.nix new file mode 100644 index 000000000000..eff7947075fb --- /dev/null +++ b/inversepath/usbarmory/host.nix @@ -0,0 +1,35 @@ +# +# Module for hosting the USB Armory +# + +{ ... }: + +let + staticDevName = "armory0"; +in + +{ + imports = [ ../../lib/hardware-notes.nix ]; + + hardwareNotes = + [ { title = "USB Armory network interface support"; + text = + '' - rename the Armory USB network interface + - set Armory inteface ip to 10.0.0.2/24 + - enable NAT and forward Armory interface + - add the name 'armory' to /etc/hosts + ''; + } + ]; + + services.udev.extraRules = + ''SUBSYSTEM=="net", ACTION=="add", ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a2", NAME="${staticDevName}"''; + # systemshit will probably still leave an a interface with a garbage name around + + networking = + { interfaces."${staticDevName}".ip4 = [{ address = "10.0.0.2"; prefixLength = 24; }]; + nat = { enable = true; internalInterfaces = [ staticDevName ]; }; + extraHosts = "10.0.0.1 armory"; + }; + +} diff --git a/usbarmory/usbarmory_dts.patch b/inversepath/usbarmory/usbarmory_dts.patch similarity index 100% rename from usbarmory/usbarmory_dts.patch rename to inversepath/usbarmory/usbarmory_dts.patch From 771087ca8876e84204dc364081100eed46dd6f76 Mon Sep 17 00:00:00 2001 From: Emery Date: Wed, 24 Feb 2016 19:41:24 +0100 Subject: [PATCH 011/624] lenovo/x220i-tablet Fixes https://github.com/NixOS/nixpkgs/issues/13173 Fixes https://github.com/NixOS/nixpkgs/issues/13174 --- lenovo/x220i-tablet.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 lenovo/x220i-tablet.nix diff --git a/lenovo/x220i-tablet.nix b/lenovo/x220i-tablet.nix new file mode 100644 index 000000000000..39b3072e4be6 --- /dev/null +++ b/lenovo/x220i-tablet.nix @@ -0,0 +1,14 @@ +{ config, pkgs, ... }: + +{ + # TPM chip countains a RNG + security.rngd.enable = true; + + boot = { + kernelModules = [ "tp_smapi" ]; + extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; + }; + + # TLP Linux Advanced Power Management + services.tlp.enable = true; +} From 0a3514de568ee2884dd642f497cae3740a3e29a4 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 10:40:24 +0100 Subject: [PATCH 012/624] new kernelAtleast option at lib/kernel-version.nix Issues a warning when the kernel version is below a threshhold. --- lib/kernel-version.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 lib/kernel-version.nix diff --git a/lib/kernel-version.nix b/lib/kernel-version.nix new file mode 100644 index 000000000000..99115a7f75e3 --- /dev/null +++ b/lib/kernel-version.nix @@ -0,0 +1,31 @@ +{ config, lib, ... }: +with lib; +let + cfg = config; +in +{ + options.kernelAtleast = mkOption { + type = types.listOf types.optionSet; + options = + [ { version = mkOption { + type = types.str; + example = "4.4"; + description = + "Issue warning when kernel version is below this number."; + }; + msg = mkOption { + type = types.str; + example = ""; + }; + } + ]; + }; + + config.warnings = builtins.concatLists (map + (x: if (builtins.compareVersions cfg.boot.kernelPackages.kernel.version x.version) == -1 + then [ "${x.msg} (${cfg.boot.kernelPackages.kernel.version} < ${x.version})" ] + else [ ] + ) cfg.kernelAtleast + ); + +} From caef1f56e99ba963254ff2bb30c9ea062d5f21d8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 11:29:48 +0100 Subject: [PATCH 013/624] import https://nixos.org/wiki/Raspberry_Pi_2 Fixes https://github.com/NixOS/nixpkgs/issues/13175 --- raspberry_pi/rpi2.nix | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 raspberry_pi/rpi2.nix diff --git a/raspberry_pi/rpi2.nix b/raspberry_pi/rpi2.nix new file mode 100644 index 000000000000..5744885dc658 --- /dev/null +++ b/raspberry_pi/rpi2.nix @@ -0,0 +1,58 @@ +/** imported from https://nixos.org/wiki/Raspberry_Pi_2 ** + +# Status +The code in master as of June 2015 should be able to prepare a bootable NixOS for Raspberry PI 2. + +There are still some drawbacks: + +NixOS does not provide a /boot/config.txt (the FAT32 partition). +Making NixOS work in the Raspberry PI 2 is mainly the result of the recent work of ambro718, Dezgeg and viric (#nixos@irc.freenode.net). + +# Download +If you want to test, you can flash this 4GB SD image (DOS partition table + fat32 + ext4 rootfs): +magnet:?xt=urn:btih:0def3f6acb3bceddb22cb24098f58e40e2853ec2&dn=rpi2-nixos-4b09501f2-img.xz&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80 + +Then you should be able to nixos-rebuild any configuration.nix changes. + +The image is the result of a "nixos-install" alone. No root password has been set, and it does not include a nixpkgs checkout or channel. + +In fact I (viric) created the FS into a NBD, not a real SD, to create this image. + +*/ + +{pkgs, config, ...}: + +{ + boot.consoleLogLevel = 7; + boot.loader.grub.enable = false; + boot.loader.generationsDir.enable = false; + boot.loader.raspberryPi.enable = true; + boot.loader.raspberryPi.version = 2; + boot.extraTTYs = [ "ttyAMA0" ]; + boot.kernelPackages = pkgs.linuxPackages_rpi; + boot.kernelParams = [ + #"coherent_pool=6M" + #"smsc95xx.turbo_mode=N" + "dwc_otg.lpm_enable=0" + "console=ttyAMA0,115200" + "rootwait" + #"console=tty1" + "elevator=deadline" + ]; + + # cpufrequtils doesn't build on ARM + powerManagement.enable = false; + + services.xserver.enable = false; + services.openssh.enable = true; + + services.nixosManual.enable = false; + + nixpkgs.config = { + platform = pkgs.platforms.raspberrypi2; + allowUnfree = true; + }; + + nix.buildCores = 4; + nix.binaryCaches = [ ]; +} \ No newline at end of file From d6f9447f9df9b8d3b8c296e4ed22ba2e830cc5cc Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 11:38:21 +0100 Subject: [PATCH 014/624] import https://nixos.org/wiki/Samsung_NP900X3c Fixes https://github.com/NixOS/nixpkgs/issues/13171 --- samsung/np900x3c.nix | 13 ++++++ samsung/np900x3c.wiki | 94 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 samsung/np900x3c.nix create mode 100644 samsung/np900x3c.wiki diff --git a/samsung/np900x3c.nix b/samsung/np900x3c.nix new file mode 100644 index 000000000000..73d16bd62151 --- /dev/null +++ b/samsung/np900x3c.nix @@ -0,0 +1,13 @@ +{ lib, ... }: +with lib; +{ + imports = [ ../lib/kernel-version.nix ]; + + services.xserver.synaptics.enable = true; + + kernelAtleast = singleton + { version = "3.9"; + msg = "Runtime system freezes can be expected on Linux kernels prior to 3.9, probably because of bugs in intel video drivers."; + }; + +} \ No newline at end of file diff --git a/samsung/np900x3c.wiki b/samsung/np900x3c.wiki new file mode 100644 index 000000000000..e9fc58b8613b --- /dev/null +++ b/samsung/np900x3c.wiki @@ -0,0 +1,94 @@ += Overview = + +Most of the features seem to be working with Linux >= 3.9 + +== Hardware == + +* CPU Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz +* RAM 4 GB +* HDD 128GB SSD +* Screen 13.3-Inch Screen +* Graphics Intel HD Graphics 4000, Ivy bridge + += Configuration = + +Full configurations is in my +[https://raw.github.com/grwlf/nixpkgs/local/machines/samsung-np900x3c-v2.nix nixpkgs branch]. Note, it requires several local packages. + +=== Touchpad === + +Touchpad is detected as 'ETPS/2 Elantech Touchpad'. xf86-input-synaptics handles +it well. Corresponding config lines: + +
+  services.xserver = {
+    synaptics = {
+      enable = true;
+      accelFactor = "0.05";
+      maxSpeed = "10";
+      twoFingerScroll = true;
+      additionalOptions =
+        ''
+        MatchProduct "ETPS"
+        Option "FingerLow"                 "3"
+        Option "FingerHigh"                "5"
+        Option "FingerPress"               "30"
+        Option "MaxTapTime"                "100"
+        Option "MaxDoubleTapTime"          "150"
+        Option "FastTaps"                  "1"
+        Option "VertTwoFingerScroll"       "1"
+        Option "HorizTwoFingerScroll"      "1"
+        Option "TrackstickSpeed"           "0"
+        Option "LTCornerButton"            "3"
+        Option "LBCornerButton"            "2"
+        Option "CoastingFriction"          "20"
+        '';
+      };
+  };
+
+ +=== Wireless === + +System requires iwlwifi-6000g2b-6.ucode in order to work. I've extracted the +file from some debian package and placed it into /root/firmware. Corresponding +config settings: + +
+  hardware.firmware = [ "/root/firmware" ];
+
+ += Problems = +There are some. See + +* [http://ubuntuforums.org/showthread.php?t=1737086 Ubuntu thread] +* [http://bugzilla.kernel.org/show_bug.cgi?id=44161 Kernel.org bug] +* [http://jablonskis.org/2012/linux-and-samsung-series-laptop-9-fn-keys/ jablonskis.org] + +=== BIOS problems === +I had to disable SSD boot completely in order to boot from USB. Just changing boot priority didn't help. + +Fix: Update BIOS up to recent version + +=== Battery === +Battery charging/discharging indicator doesn't work good. + +Fix: Update BIOS up to recent version + +=== Lid === +Acpi thinks lid is always open +
+[ierton@greyblade:~]$ cat /proc/acpi/button/lid/LID0/state 
+state:      open
+
+ +Related [https://bugzilla.kernel.org/show_bug.cgi?id=44161 Kernel bug #44161] + +=== Multimedia keys === +* rfkill/fanless don't work +* volume up/down don't work +* brightness up/down work, but release is broken +* touchpad disable works + +Related discussion on +[http://jablonskis.org/2012/linux-and-samsung-series-laptop-9-fn-keys/ jablonskis.org] + From fe0e5b767e35eee3d2ebf0417e7bed1d62c06196 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 11:42:57 +0100 Subject: [PATCH 015/624] import https://nixos.org/wiki/Microsoft_Surface_Pro_3 Fixes https://github.com/NixOS/nixpkgs/issues/13167 --- microsoft/surface_pro_3.nix | 8 +++++++ microsoft/surface_pro_3.wiki | 41 ++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 microsoft/surface_pro_3.nix create mode 100644 microsoft/surface_pro_3.wiki diff --git a/microsoft/surface_pro_3.nix b/microsoft/surface_pro_3.nix new file mode 100644 index 000000000000..48528f90c5c5 --- /dev/null +++ b/microsoft/surface_pro_3.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + # to use the type cover in the initrd + boot.kernelModules = [ "hid-microsoft" ]; + + networking.wireless.enable = true; +} diff --git a/microsoft/surface_pro_3.wiki b/microsoft/surface_pro_3.wiki new file mode 100644 index 000000000000..9ffdc559e183 --- /dev/null +++ b/microsoft/surface_pro_3.wiki @@ -0,0 +1,41 @@ +Work in progress. This is the setup for a dual-boot windows/NixOS. + +== Installation == + +Current requirements: +* USB stick +* Latest unstable minimal installation iso, I used [[https://nixos.org/releases/nixos/unstable/nixos-15.05pre61665.4c01e6d/nixos-minimal-15.05pre61665.4c01e6d-x86_64-linux.iso the 15.06-pre one]] +* (maybe) USB keyboard and therefore a USB hub +* WiFi SSID and password + +In the current installation iso, the kernel doesn't support the MS Type cover yet, so you need a USB keyboard for the initial install. Also note that at one point the keyboard wasn't working, and I couldn't see it in lsusb output. After a cold boot it worked fine. + +=== Steps === + +Preparation: +* Copy the ISO to the USB stick as explained [[https://nixos.org/nixos/manual/sec-installation.html#sec-booting-from-usb in the manual]]. Note that if you just dd the image onto the USB stick, it will boot without changes +* With Windows Disk Management, shrink the windows disk so you have room for your installation. Use the free space to create a new partition without a filesystem or drive letter. +* Check out [[https://github.com/cransom/surface-pro-3-nixos this expression and set of patches]] and add it to support newer versions of the Type Cover as well as enable the touch screen. + +* Reboot the Surface and furiously tap Esc until you end up in the BIOS screen. There, turn off secure boot (don't delete the keys), and change the boot order to USB + SSD. Save. +* You should now be in the NixOS installer +* Attach the USB stick and keyboard if the Type Cover doesn't work. The NixOS manual is at alt+F8 + +Installation: +* Using gdisk, print your partition table to find the empty partition you created. Find the EFI partition number (1 for me) and your new partition number (5 for me). +* Create your filesystem of choice on the partition, I picked btrfs: `mkfs.btrfs -L root /dev/disk/by-id/xxx-5` (xxx is the samsung ssd). Mount it on /mnt. +** With btrfs it's wise to put the nix store in its own subvolume: `btrfs subvol create /mnt/nix; btrfs subvol create /mnt/nix/store` +* We'll be using Gummiboot, which needs to access the EFI partition. `mkdir /mnt/boot; mount /dev/disk/by-id/xxx-1` +* Initialize your hardware configuration: `nixos-generate-config --root /mnt` +* Create your wifi credentials: `wpa_passphrase SSID PASS > /etc/wpa_supplicant.conf; cp /etc/wpa_supplicant.conf /mnt/etc`. Check that ifconfig gets an ip address. +* Edit /mnt/etc/configuration.nix, making sure that you have at least: + networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + boot.kernelPackages = pkgs.linuxPackages_latest; + # be able to use the type cover in the initrd + boot.kernelModules = [ "hid-microsoft" ]; +* Install: `nixos-install` + +If this completes successfully, you should be able to reboot, remove the USB stick, and NixOS should come up. + +'''Note''': If using the hid-multitouch patch, you can boot windows as well as other profiles of NixOS without using a usb keyboard. From 088440bd65c9a55c79d938023c5e5fac4a41af1f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 11:46:42 +0100 Subject: [PATCH 016/624] Add tips and tricks section to README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 98ae40844e7e..f697a7b2dec2 100644 --- a/README.md +++ b/README.md @@ -17,3 +17,8 @@ and performance configs can be declared in seperate modules. Because modules can only be tested with the appropriate hardware, quality assurance is up to **you**. + +## Simple tips and tricks + +### Disable PC speaker +```boot.blacklistedKernelModules = [ "pcspkr" ];``` From 8de044301082f245a79840377efb7c86bd202f11 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 11:52:45 +0100 Subject: [PATCH 017/624] import https://nixos.org/wiki/ASUS_M60J-JX041V Fixes https://github.com/NixOS/nixpkgs/issues/13166 --- asus/m60j-jx041v.wiki | 98 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 asus/m60j-jx041v.wiki diff --git a/asus/m60j-jx041v.wiki b/asus/m60j-jx041v.wiki new file mode 100644 index 000000000000..51a0cd12edd8 --- /dev/null +++ b/asus/m60j-jx041v.wiki @@ -0,0 +1,98 @@ +This page is a work in progress. + += Overview = + +Most of the features seem to be working with Linux 2.6.32. + +== Hardware == + +* Ethernet: Attansic Technology Corp. Device 1063 (rev c0) +* Wireless: Intel Corporation Wifi Link 100 Series +* Bluetooth: +* Sound: Realtek ALC269 +* Video: nVidia GeForce GT 240M +* Video RAM: 1GB DDR3 +* CPU: Core i7 720 QM (4 core, 2 threads per core) +* RAM: 4 GB +* HDD: 2* 320 GB, 5200 rpm. +* Fingerprint Sensor. + +== Support == + +* Ethernet: Yes. +* Wireless: Yes. +* Bluetooth: Yes. +* Sound: Yes. +* Video: Yes. (dual screen working fine) +* Software Raid: Yes. +* Keyboard: some Function (Fn) keys are not recognized / mapped correctly. +* Fingerprint Sensor: Not tested. (listed by lshal) + +== Tests == + +* Video: +** Maximal Resolution: 1366x768 +** glxgears: 1859.8 FPS @ 1366x768 + += Configuration = + +You can see the configuration file specific to this computer at [https://svn.nixos.org/repos/nix/configurations/trunk/computer/asus/m60j/jx041v.nix configurations/computer/asus/m60j/jx041v.nix] + += Problems & Solutions = + +== No Ethernet == + +This problem appear if you are using an old kernel. + +
[root@nixos:]# lspci -v | sed -n '/Ethernet/ { :loop p; n; s/^$//; T loop; q}'
+07:00.0 Ethernet controller: Attansic Technology Corp. Device 1063 (rev c0)
+        ...
+        Kernel driver in use: atl1c
+        Kernel modules: atl1c
+
+ +While searching on the web you find that this ethernet device need the kernel module atl1e instead of atl1c. The following sources explain how to unpack & compile & install such module on usual distributions. As we are on a NixOS, things are a bit different. + +To follow the instruction you need to find a way to copy the module sources of AR81Family-linux-v1.0.0.10.tar.gz ([http://www.backtrack.it/~emgent/hackstuff/Attansic/ http://www.backtrack.it/~emgent/hackstuff/Attansic/]) on the targeted device. + +
+# avoid messing up your term
+[root@nixos:]# initctl stop dhclient
+# add dependencies in the environment
+[root@nixos:]# nix-env -i gcc gnumake
+[root@nixos:]# ln -s /nix/store/*-linux-$(uname -r)/lib /lib
+# unpack & compile
+[root@nixos:]# mkdir /tmp/AR81Family-linux
+[root@nixos:]# cp .../AR81Family-linux-v1.0.0.10.tar.gz .
+[root@nixos:]# yes y | tar xzf AR81Family-linux-v1.0.0.10.tar.gz
+[root@nixos:]# cd src
+[root@nixos:]# make
+# Replace the current module
+[root@nixos:]# rmmod atl1c
+[root@nixos:]# modprobe /tmp/AR81Family-linux/src/atl1e.ko
+# start fetching an IP address.
+[root@nixos:]# initctl start dhclient
+
+ +At the end, you end up with a working interface and the following result: + +
[root@nixos:]# lspci -v | sed -n '/Ethernet/ { :loop p; n; s/^$//; T loop; q}'
+07:00.0 Ethernet controller: Attansic Technology Corp. Device 1063 (rev c0)
+        ...
+        Kernel driver in use: atheros_eth
+        Kernel modules: atl1c
+
+ +Many reference to AR81Family-linux-v1.0.1.0.tar.gz can be found on the web, but the manufacturer links are broken. + +Sources: +* [http://platonic.techfiz.info/2009/10/25/ethernet-controller-attansic-technology-corp-device-1063-on-ubuntu/ http://platonic.techfiz.info/2009/10/25/ethernet-controller-attansic-technology-corp-device-1063-on-ubuntu/] + +== Grub == + +* Changing the boot sequence in the BIOS is changing the apparent mapping of hard-drives. Thus hd0 and hd1 are inverted in GRUB 2. +* The MBR is not restored by the recovery CDs. + +[[Category:Installation]] +[[Category:Hardware]] +[[Category:Laptops]] From 57ac96688731f64b7eca8d6b23ae45aa59ebc0bd Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 11:59:36 +0100 Subject: [PATCH 018/624] import https://nixos.org/wiki/Acer_4810T Fixes https://github.com/NixOS/nixpkgs/issues/13168 --- acer/4810t.nix | 37 ++++++++++++++++ acer/4810t.wiki | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 acer/4810t.nix create mode 100644 acer/4810t.wiki diff --git a/acer/4810t.nix b/acer/4810t.nix new file mode 100644 index 000000000000..ce1091bd87b7 --- /dev/null +++ b/acer/4810t.nix @@ -0,0 +1,37 @@ +/* imported from https://nixos.org/wiki/Acer_4810T */ + +{ config, pkgs, lib, ... }: + +{ + # Make te network WLAN card (wlan0) firmware available + require = [ /nixos/modules/hardware/network/intel-5000.nix ]; + + boot = rec { + initrd.kernelModules = [ "ata_piix" ]; + kernelParams = [ + "apm=on" + "acpi=on" + "vga=0x317" + "video=vesafb:ywrap" + # Important, to disable Kernel Mode Setting for the graphics card + # This will allow backlight regulation + "nomodeset" + ]; + kernelModules = [ + "kvm-intel" + ]; + }; + + services = { + xserver = { + enable = true; + defaultDepth = 24; + videoDriver = "intel"; + autorun = true; + driSupport = false; + synaptics = { + enable = true; + dev = "/dev/input/event8"; + }; + }; +}; diff --git a/acer/4810t.wiki b/acer/4810t.wiki new file mode 100644 index 000000000000..0b045b6e4da8 --- /dev/null +++ b/acer/4810t.wiki @@ -0,0 +1,110 @@ += Overview = +* CPU: Intel Core 2 Solo U3500 @ 1.40GHz (speeds: 0.8, 1.2 and 1.4GHz), 3MB L2 +* Screen: 1366x768 LED + += BIOS versions = +* 1.10 - average ACPI temperature around 34°C, good GL playing +* 1.20 - average ACPI temperature around 39°C, good GL playing +* 1.31 - big slowdown in X windows from time to time, GL games with annoying slowdowns regularly + +The most recent BIOS updates (1.20 onwards) come with a DOS flasher; older come only with a windows flasher. I used a [http://www.pcengines.ch/freedos.htm freedos image] stored in a USB flash memory to boot freedos and flash the BIOS. + += Drivers = +All provided in linux 2.6.32 kernels. + +Linux 2.6.29 has problems at least with the wire ethernet card (Attansic Technology Corp. Device 1063). Loading and unloading the ethernet card driver module (atl1c) helps getting a working link, although it will change from eth0 to eth1, eth2, or another interface name. + +== lspci == + 00:00.0 Host bridge: Intel Corporation Mobile 4 Series Chipset Memory Controller Hub (rev 07) + 00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07) + 00:02.1 Display controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07) + 00:1a.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #4 (rev 03) + 00:1a.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #5 (rev 03) + 00:1a.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #2 (rev 03) + 00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 03) + 00:1c.0 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 1 (rev 03) + 00:1c.1 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 2 (rev 03) + 00:1d.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #1 (rev 03) + 00:1d.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #2 (rev 03) + 00:1d.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #3 (rev 03) + 00:1d.3 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #6 (rev 03) + 00:1d.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #1 (rev 03) + 00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev 93) + 00:1f.0 ISA bridge: Intel Corporation ICH9M-E LPC Interface Controller (rev 03) + 00:1f.2 IDE interface: Intel Corporation ICH9M/M-E 2 port SATA IDE Controller (rev 03) + 00:1f.3 SMBus: Intel Corporation 82801I (ICH9 Family) SMBus Controller (rev 03) + 00:1f.5 IDE interface: Intel Corporation ICH9M/M-E 2 port SATA IDE Controller (rev 03) + 00:1f.6 Signal processing controller: Intel Corporation 82801I (ICH9 Family) Thermal Subsystem (rev 03) + 01:00.0 Ethernet controller: Attansic Technology Corp. Device 1063 (rev c0) + 02:00.0 Network controller: Intel Corporation Wireless WiFi Link 5100 + += Configuration = + + { + # Make te network WLAN card (wlan0) firmware available + require = [ ./nixos/modules/hardware/network/intel-5000.nix ]; + + boot = rec { + initrd = { + kernelModules = [ "ata_piix" "reiserfs" ]; + }; + kernelParams = [ + "selinux=0" + "apm=on" + "acpi=on" + "vga=0x317" + "console=tty1" + "video=vesafb:ywrap" + # Important, to disable Kernel Mode Setting for the graphics card + # This will allow backlight regulation + "nomodeset" + ]; + kernelModules = [ + "acpi-cpufreq" + "cpufreq-ondemand" # not autoloaded in 2.6.32.2 + "kvm-intel" + ]; + resumeDevice = "8:2"; + extraKernelParams = ["resume=/dev/sda2"]; + kernelPackages = pkgs.kernelPackages_2_6_32; + postBootCommands = '' + echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + ''; + }; + + services = { + xserver = { + enable = true; + defaultDepth = 24; + videoDriver = "intel"; + exportConfiguration = true; + enableTCP = true; + autorun = true; + driSupport = false; + synaptics = { + enable = true; + dev = "/dev/input/event8"; + }; + }; + }; + += X settings = + +== Backlight == +Having disabled Kernel Mode Setting for the i915 kernel drm module (kernel parameter ''nomodeset''), use ''xrandr'' to set: + xrandr --output LVDS --set BACKLIGHT_CONTROL combination + xrandr --output LVDS --set BACKLIGHT 300 # ~1000, max light. + +If those steps make your mouse cursor not appear, switch to another VT, and then back to X, and it will come. + +== Synaptics pad == +I like the pad speed set by: + synclient MaxTapTime=0 MaxSpeed=1.12 MinSpeed=0.6 AccelFactor=0.001 VertEdgeScroll=1 +Install the ''xf86-input-synaptics-1.2.0'' for ''synclient'' to be in your PATH. + += Suspending and hibernating = +Usual pm-utils work, with pm-suspend and pm-hibernate. + +[[Category:Installation]] +[[Category:Hardware]] +[[Category:Laptops]] From afd33028e3d638d14e59a8bb38790ff4b68938dd Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 12:03:28 +0100 Subject: [PATCH 019/624] import https://nixos.org/wiki/Acer_C720_Chromebook Fixes https://github.com/NixOS/nixpkgs/issues/13169 --- acer/c720.nix | 10 ++++++++++ acer/c720.wiki | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 acer/c720.nix create mode 100644 acer/c720.wiki diff --git a/acer/c720.nix b/acer/c720.nix new file mode 100644 index 000000000000..483608925d6a --- /dev/null +++ b/acer/c720.nix @@ -0,0 +1,10 @@ +{ lib, ... }: +with lib; +{ + imports = singleton ../lib/kernerl-version.nix; + + kernelAtleast = singleton + { version = "3.18"; + msg = "Cypress APA touchpad supported added in Linux-3.17-rc1"; + }; +} diff --git a/acer/c720.wiki b/acer/c720.wiki new file mode 100644 index 000000000000..5200ab69c6c7 --- /dev/null +++ b/acer/c720.wiki @@ -0,0 +1,23 @@ += Overview = +* Processor: Intel Celeron 2955U @ 1.40GHz +* Network controller: Qualcomm Atheros AR9462 + += Configuration = +The C720 comes with a Cypress APA touchpad. Support for this touchpad was added in kernel 3.17-rc1. +In order to get the touchpad working CONFIG_CHROME_PLATFORMS needs to be enabled. + +For example, for touchpad support with the 3.18 kernel, the following should be added to /etc/nixos/configuration.nix: + + boot.kernelPackages = pkgs.linuxPackages_3_18; + nixpkgs.config.packageOverrides = pkgs: + { linux_3_18 = pkgs.linux_3_18.override { + extraConfig = + ''''''' + CHROME_PLATFORMS y + '''''''; + }; + }; + +[[Category:Installation]] +[[Category:Hardware]] +[[Category:Laptops]] From a667b3aa4f2f4466aff22c995e9c0f934399eae7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 26 Feb 2016 12:06:00 +0100 Subject: [PATCH 020/624] import https://nixos.org/wiki/Airis_N990 Fixes https://github.com/NixOS/nixpkgs/issues/13170 --- airis/n990.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 airis/n990.nix diff --git a/airis/n990.nix b/airis/n990.nix new file mode 100644 index 000000000000..b3056b7d0b4d --- /dev/null +++ b/airis/n990.nix @@ -0,0 +1,22 @@ +{ ... }: + +{ + boot = { + initrd.kernelModules = [ "pata_via" ]; + + kernelParams = [ + "apm=on" + "acpi=on" + "vga=0x317" # 1024x768 + "console=tty1" + "video=vesafb:ywrap" # Faster scroll + ]; + }; + + services.xserver = { + videoDriver = "unichrome"; + synaptics.enable = true; + }; + + networking.enableIntel2200BGFirmware = true; +} From f6629260e1d4f238d12de74bc56ebd4fe44c4fb4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 5 Mar 2016 11:04:24 -0800 Subject: [PATCH 021/624] Dell XPS 15 9550 --- dell/xps-15-9550.nix | 35 +++++++++++++++++++++++++++++++++++ dell/xps-15-9550.wiki | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 dell/xps-15-9550.nix create mode 100644 dell/xps-15-9550.wiki diff --git a/dell/xps-15-9550.nix b/dell/xps-15-9550.nix new file mode 100644 index 000000000000..ad6234c24e72 --- /dev/null +++ b/dell/xps-15-9550.nix @@ -0,0 +1,35 @@ +{ config, pkgs, ... }: + +{ + # BEGIN from generated hardware-configuration + imports = + [ + + ../lib/kernel-version.nix + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "rtsx_pci_sdmmc" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + nix.maxJobs = 8; + # END from generated hardware-configuration + + # Use the gummiboot efi boot loader. (From default generated configuration.nix) + boot.loader.gummiboot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Honestly forget if needed or just better for touchpad. + # Would be nice to try libinput instead once nixos-unstable updates + services.xserver.synaptics.enable = true; + + # Intel Graphics confirmed not working at 4.1, confirmed working at {4.3, 4.4} + kernelAtleast = + [ { version = "4.2"; msg = "Intel Graphics confirmed not to work."; } + { version = "4.3"; msg = "Intel Graphics untested."; } + { version = "4.4"; msg = "Touchpad does not work, though the touchscreen still does"; } + ]; + + # To just use intel integrated graphics with Intel's open source driver + # hardware.nvidiaOptimus.disable = true; +} diff --git a/dell/xps-15-9550.wiki b/dell/xps-15-9550.wiki new file mode 100644 index 000000000000..1f695a60a0e3 --- /dev/null +++ b/dell/xps-15-9550.wiki @@ -0,0 +1,38 @@ += Dell XPS 15 9550 = + +Most of this I presume also applies to the XPS 13 1530, the 13" variant. + +== Tested Hardware == + +* CPU: Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz +* RAM: 16 GB +* HDD: 512 GiB SSD +* Screen: 15" 4k (3840✕2160) +* Graphics: NVIDIA Corporation GM107M, with Intel Graphics too. +* Input: Touchscreen and trackpad. + + +== Firmware Configuration == + +Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. + +=== Before installation === + +These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. + +* ''Disable Secure Boot (but keep UEFI Boot).'' Thakfully doing so is as easy as changing any other simple setting. + +* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) + + +=== After installation === + +* ''Add gummiboot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. + +=== Optional === + +* ''Disable C-States.'' This is a processor idling thing. It seems to cause random crashes (Blank screen, no normal panic debug dump). Unfortunately, without it, the computer cannot be suspended. On the other hand, it doesn't seem to affect acpi's estimation of battery life when the computer is running with minimal load, but I haven't tested battery life in practice. I list it as optional as there's a tradeoff, and the crashes are rare enough one can probably get through installation just fine. + +* ''Update BIOS.'' According to Reddit, this helps with battery life. + +* ''Update Intel's Thunderbolt firmware.'' Without this, the Thunderbolt port will only work as power source, and not transfer data. From 862456cfd5ff0926a29a5beceac007f27155e537 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 5 Mar 2016 11:32:34 -0800 Subject: [PATCH 022/624] Comment out generated configuration for now, best to just regenerate it --- dell/xps-15-9550.nix | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dell/xps-15-9550.nix b/dell/xps-15-9550.nix index ad6234c24e72..f7d092779160 100644 --- a/dell/xps-15-9550.nix +++ b/dell/xps-15-9550.nix @@ -1,19 +1,24 @@ { config, pkgs, ... }: { - # BEGIN from generated hardware-configuration imports = - [ - - ../lib/kernel-version.nix + [ ../lib/kernel-version.nix ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "rtsx_pci_sdmmc" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - nix.maxJobs = 8; - # END from generated hardware-configuration + ## BEGIN from generated hardware-configuration + ## Probably better to just use a freshly generated hardware.configuration.nix + ## than this, but including for reference. + #imports = + # [ + # + # ]; + # + #boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "rtsx_pci_sdmmc" ]; + #boot.kernelModules = [ "kvm-intel" ]; + #boot.extraModulePackages = [ ]; + # + #nix.maxJobs = 8; + ## END from generated hardware-configuration # Use the gummiboot efi boot loader. (From default generated configuration.nix) boot.loader.gummiboot.enable = true; From 74c8b025cd56f465d52f0cf597c1bf386eea7247 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 23 Mar 2016 13:39:24 -0700 Subject: [PATCH 023/624] Better to use libinput than synaptics --- dell/xps-15-9550.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dell/xps-15-9550.nix b/dell/xps-15-9550.nix index f7d092779160..20aad2b84620 100644 --- a/dell/xps-15-9550.nix +++ b/dell/xps-15-9550.nix @@ -25,8 +25,8 @@ boot.loader.efi.canTouchEfiVariables = true; # Honestly forget if needed or just better for touchpad. - # Would be nice to try libinput instead once nixos-unstable updates - services.xserver.synaptics.enable = true; + # Synaptics also works, but doesn't have working palm and thumb detection. + services.xserver.libinput.enable = true; # Intel Graphics confirmed not working at 4.1, confirmed working at {4.3, 4.4} kernelAtleast = From 5a74a39cab7d5da5ad56f632e99f49b1d9a581b3 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 8 Apr 2016 16:27:04 +0200 Subject: [PATCH 024/624] buggy drivers fixed on a1sri-2758f --- supermicro/a1sri-2758f.nix | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/supermicro/a1sri-2758f.nix b/supermicro/a1sri-2758f.nix index b199bf16b568..c16c093936e2 100644 --- a/supermicro/a1sri-2758f.nix +++ b/supermicro/a1sri-2758f.nix @@ -3,28 +3,18 @@ # This board contains a TPM header, but you must supply your own module. # -{ pkgs, ... }: +{ pkgs, lib, ... }: { - imports = [ ../lib/hardware-notes.nix ]; + imports = [ ../lib/kernel-version.nix ]; environment.systemPackages = [ pkgs.ipmitool ]; boot.kernelModules = [ "ipmi_devintf" "ipmi_si" ]; - networking.dhcpcd.extraConfig = "nolink"; - - hardwareNotes = - [ { title = "IPMI"; - text = "Load IPMI kernel modules and ipmitool to system environment."; - } - { title = "Nolink"; - text = - '' - Interface link state detection is disabled in dhcpcd because - the Linux driver seems to send erronous loss of link messages - that cause dhcpcd to release every few seconds, which is - more annoying than not releasing when a cable is unplugged. - ''; - } - ]; + kernelAtleast = lib.singleton + { version = "4.4"; + msg = + "ethernet driver may be buggy on older kernels, "+ + ''try 'networking.dhcpcd.extraConfig = "nolink";' if you encounter loss of link problems''; + }; } From 0d7971f57f72c7cb915c32032761da81f983c3c2 Mon Sep 17 00:00:00 2001 From: Hannu Hartikainen Date: Thu, 21 Apr 2016 14:38:40 +0300 Subject: [PATCH 025/624] Thinkpad X220i: configure more hardware Here's a patch that shows how to add support for - TrackPoint - (alternatively) better touchpad support - volume/mute buttons - active hard-drive protection - fingerprint reader I've been using these options for a couple of days on a non-tablet X220i. See https://github.com/dancek/dotfiles/blob/master/nixos/thinkpad-x220i/configuration.nix --- lenovo/x220i-tablet.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/lenovo/x220i-tablet.nix b/lenovo/x220i-tablet.nix index 39b3072e4be6..7ea8d735b5cf 100644 --- a/lenovo/x220i-tablet.nix +++ b/lenovo/x220i-tablet.nix @@ -11,4 +11,23 @@ # TLP Linux Advanced Power Management services.tlp.enable = true; + + # hard disk protection if the laptop falls + services.hdapsd.enable = true; + + # trackpoint support (touchpad disabled in this config) + hardware.trackpoint.enable = true; + hardware.trackpoint.emulateWheel = true; + + # alternatively, touchpad with two-finger scrolling + #services.xserver.libinput.enable = true; + + # enable volume control buttons + sound.enableMediaKeys = true; + + # fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) + #services.fprintd.enable = true; + #security.pam.services.login.fprintAuth = true; + #security.pam.services.xscreensaver.fprintAuth = true; + # similarly for other PAM providers } From a2b20351e0557192f7be9c40fb5ead04e9fa9dfc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 3 Jun 2016 16:07:56 -0700 Subject: [PATCH 026/624] s/gummiboot/systemd-boot -- fixes warnings on unstable --- dell/xps-15-9550.nix | 4 ++-- dell/xps-15-9550.wiki | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dell/xps-15-9550.nix b/dell/xps-15-9550.nix index 20aad2b84620..ac935acc5be6 100644 --- a/dell/xps-15-9550.nix +++ b/dell/xps-15-9550.nix @@ -20,8 +20,8 @@ #nix.maxJobs = 8; ## END from generated hardware-configuration - # Use the gummiboot efi boot loader. (From default generated configuration.nix) - boot.loader.gummiboot.enable = true; + # Use the systemd-boot efi boot loader. (From default generated configuration.nix) + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; # Honestly forget if needed or just better for touchpad. diff --git a/dell/xps-15-9550.wiki b/dell/xps-15-9550.wiki index 1f695a60a0e3..d67395587a96 100644 --- a/dell/xps-15-9550.wiki +++ b/dell/xps-15-9550.wiki @@ -27,7 +27,7 @@ These settings are needed both for booting the final install, and installer itse === After installation === -* ''Add gummiboot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. +* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. === Optional === From 123b0a9846b837278f7cd7821fb38fa2f0662e53 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 9 Jul 2016 11:36:19 +0200 Subject: [PATCH 027/624] lenovo/t460s.nix (#13) --- lenovo/t460s.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 lenovo/t460s.nix diff --git a/lenovo/t460s.nix b/lenovo/t460s.nix new file mode 100644 index 000000000000..ee0f9ba6163b --- /dev/null +++ b/lenovo/t460s.nix @@ -0,0 +1,30 @@ +{ config, pkgs, ... }: + +{ + imports = + [ ../lib/kernel-version.nix + ]; + + ## BEGIN from generated hardware-configuration + ## Probably better to just use a freshly generated hardware.configuration.nix + ## than this, but including for reference. + # boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + # boot.kernelModules = [ "kvm-intel" ]; + # boot.extraModulePackages = [ ]; + # + # + # nix.maxJobs = lib.mkDefault 4; + ## END from generated hardware-configuration + + # Use the gummiboot efi boot loader. (From default generated configuration.nix) + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_T460s + kernelAtleast = [ + { version = "4.5.1"; msg = "The physical mouse buttons works incorrectly."; } + { version = "4.6"; msg = "Suspending the T460s by closing the lid when running on battery causes the machine to freeze up entirely."; } + ]; + + hardware.enableAllFirmware = true; +} From 5b3c112a91e92d5e030915447000e4d9facea018 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 5 Aug 2016 11:47:24 +0200 Subject: [PATCH 028/624] lenovo/t460s: add middle button config + comments (#14) --- lenovo/t460s.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/lenovo/t460s.nix b/lenovo/t460s.nix index ee0f9ba6163b..4aaed1445e36 100644 --- a/lenovo/t460s.nix +++ b/lenovo/t460s.nix @@ -26,5 +26,34 @@ { version = "4.6"; msg = "Suspending the T460s by closing the lid when running on battery causes the machine to freeze up entirely."; } ]; + # For the wifi (intel iwlwifi) hardware.enableAllFirmware = true; + + # For the screen. I don't know what to do with this information, but + # the hiDPI support is far from perfect (as of July 2016): + + # Resolution: 2560 x 1440 px + # Size: 12.2" × 6.86" (30.99cm × 17.43cm) + # DPI: 209.8 + # Dot Pitch: 0.1211mm + # Aspect Ratio: 16 × 9 (1.78:1) + # Pixel Count: 3,686,400 + # Megapixels: 3.69MP + + # Use libinput to let the physical middle button be used to scroll + # with the trackpoint + services.xserver = { + libinput.enable = true; + synaptics.enable = false; + + config = '' + Section "InputClass" + Identifier "Enable libinput for TrackPoint" + MatchIsPointer "on" + Driver "libinput" + Option "ScrollMethod" "button" + Option "ScrollButton" "8" + EndSection + ''; + }; } From bc241aeec7bb78ad7b6362c8324f194a5696e64b Mon Sep 17 00:00:00 2001 From: Stephen Whitmore Date: Fri, 5 Aug 2016 02:48:33 -0700 Subject: [PATCH 029/624] Add Lenovo x140e laptop. (#17) --- lenovo/x140e.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 lenovo/x140e.nix diff --git a/lenovo/x140e.nix b/lenovo/x140e.nix new file mode 100644 index 000000000000..f825f44f1970 --- /dev/null +++ b/lenovo/x140e.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +{ + boot = { + # wireless + kernelModules = [ "kvm-amd" "wl" ]; + extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; + + # audio device + extraModprobeConfig = '' + options snd_hda_intel enable=0,1 + ''; + }; + + # video card + services.xserver.videoDrivers = ["ati"]; + + # trackpad (touchpad disabled) + hardware.trackpoint = { + enable = true; + emulateWheel = true; + }; + + # media keys + sound.enableMediaKeys = true; +} From cfd63d3b3e15fd440701dbbd25d57effe379b87d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=D0=BE=20=D0=93=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD=D1=81=D1=8C=D0=BA=D0=B8=D0=B9=20=28Danylo=20Hlynskyi=29?= Date: Wed, 21 Sep 2016 12:33:54 +0300 Subject: [PATCH 030/624] add Lenovo IdeaPad Z510 with suspend fix (#18) --- lenovo/z510.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lenovo/z510.nix diff --git a/lenovo/z510.nix b/lenovo/z510.nix new file mode 100644 index 000000000000..f1f5416b5be6 --- /dev/null +++ b/lenovo/z510.nix @@ -0,0 +1,8 @@ +{ config, pkgs, ... }: +{ + hardware.cpu.intel.updateMicrocode = true; + + # see https://github.com/NixOS/nixpkgs/issues/18356 + # found buggy driver with method https://wiki.ubuntu.com/DebuggingKernelSuspend + boot.blacklistedKernelModules = [ "nouveau" ]; +} From f51cdd05356c2169dd2e31be96d487752603dd33 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 20 Oct 2016 14:28:23 -0400 Subject: [PATCH 031/624] Add .gitignore adapted from NixPkgs --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..2151b35ff51e --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*~ +,* +.*.swp +.*.swo +result +result-* +.version-suffix + +.DS_Store From e5cc44520fecf4b257f33cd6acf615d528c2a110 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 20 Oct 2016 14:53:52 -0400 Subject: [PATCH 032/624] Apple MacBook Pro 10,1 --- apple/macbook-pro-10-1.nix | 41 +++++++++++++++++++++++++++++++++++++ apple/macbook-pro-10-1.wiki | 9 ++++++++ 2 files changed, 50 insertions(+) create mode 100644 apple/macbook-pro-10-1.nix create mode 100644 apple/macbook-pro-10-1.wiki diff --git a/apple/macbook-pro-10-1.nix b/apple/macbook-pro-10-1.nix new file mode 100644 index 000000000000..f9ba24de4ec8 --- /dev/null +++ b/apple/macbook-pro-10-1.nix @@ -0,0 +1,41 @@ +{ config, pkgs, ... }: + +{ + imports = + [ ../lib/kernel-version.nix + ]; + + ## BEGIN from generated hardware-configuration + ## Probably better to just use a freshly generated hardware.configuration.nix + ## than this, but including for reference. + #imports = + # [ + # ]; + # + #boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" "sdhci_pci" ]; + #boot.kernelModules = [ "kvm-intel" "wl" ]; + #boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; + # + #nix.maxJobs = lib.mkDefault 8; + ## END from generated hardware-configuration + + # Use the systemd-boot efi boot loader. (From default generated configuration.nix) + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # I use this but not sure whether its needed. + # Right click does *NOT* work + services.xserver.libinput.enable = true; + + kernelAtleast = + [ { version = "4.7"; msg = "Broadcom WiFi confirmed not to work."; } + ]; + + # Couldn't get X to work with nvidia + # Also, PTYs don't work after X/nvidia starts + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.opengl.driSupport32Bit = true; + + # Seems to improve battery life *and* keep the CPU cooler + services.mbpfan.enable = true; +} diff --git a/apple/macbook-pro-10-1.wiki b/apple/macbook-pro-10-1.wiki new file mode 100644 index 000000000000..149b30e6ed22 --- /dev/null +++ b/apple/macbook-pro-10-1.wiki @@ -0,0 +1,9 @@ += Apple MacBook Pro 10,1 = + +I presume the associated configuration also will work with to other 10,x models. + +If you don't have an Ethernet adapter, make sure your NixOS installer has a sufficiently modern kernel or you will be stuck without internet and unable to installer. + +Note that (with NixPkgs circa late October 2016) Linux 4.8.1 does not work: everything will boot through X, but then manually-run commands accessing peripherals (nmcli, lspci, etc) will hang inexplicably. + +Thankfully no tweaking of the BIOS or similar was needed. Do note that if your MacOS partition is encrypted, you will have an easier time shrinking it from within MacOS, but this is standard advice. From 6874b73d558267db0056d7f406a411b0f2954913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Czapli=C5=84ski?= Date: Fri, 24 Mar 2017 17:43:31 +0100 Subject: [PATCH 033/624] add guide for running NixOS as Hyper-V guest --- microsoft/hyper-v-guest.md | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 microsoft/hyper-v-guest.md diff --git a/microsoft/hyper-v-guest.md b/microsoft/hyper-v-guest.md new file mode 100644 index 000000000000..3faa258e851b --- /dev/null +++ b/microsoft/hyper-v-guest.md @@ -0,0 +1,60 @@ +This is a setup for installing NixOS in Hyper-V as a guest. + +I don't have details handy anymore on the detailed steps I had to do on the Windows host +(there's no NixWindows yet, unfortunately...), so you'll have to try googling that yourself, e.g. something like +"linux on hyper-v" or "ubuntu on hyper-v". (You're welcome to send PRs with improvements of this guide.) +Below, I'm providing only the info with what to do on the NixOS side of things. + +## Installation ## + +I basically followed the [guide for NixOS on VirtualBox](https://nixos.org/wiki/Installing_NixOS_in_a_VirtualBox_guest). +However, some additional changes in `/etc/nixos/configuration.nix` were required to really make it work +(I don't include them as a .nix file, as they must be done **before `nixos-install`**, and I'm not sure how to proceed +with cloning the nixos-hardware repo at this stage): + + # REQUIRED - see: https://github.com/nixos/nixpkgs/issues/9899 + boot.initrd.kernelModules = ["hv_vmbus" "hv_storvsc"]; + + # OPTIONAL - use 800x600 resolution for text console, to make it easy to fit on screen + boot.kernelParams = ["video=hyperv_fb:800x600"]; # https://askubuntu.com/a/399960 + + # UNKNOWN - not sure if below are needed; were suggested for VirtualBox and I used them + boot.loader.grub.device = "/dev/sda"; + boot.initrd.checkJournalingFS = false; + +## Shared folder ## + +To share a folder between Windows host and Linux/NixOS guest, the typical solution seems to be to make a folder "shared" +on Windows, then access it via Samba from NixOS. +On the Windows host, I had to make an additional virtual switch in Hyper-V Manager, with mode "internal". +Then in properties of the virtual network card on Windows host (attached to the virtual switch), I +changed the IP to a fixed 10.0.0.100 (mask 255.255.255.240). I also added a special purpose user on the host, with some +long randomly generated password, to act as Samba credentials for NixOS. +To test that it works, I used the following commands: + + $ nix-env -iA nixos.samba + $ smbclient -L //10.0.0.100 -U shares-guest%ReplaceWithSomeLongRandomlyGeneratedPassword + Domain=[DESKTOP-ABCD123] OS=[Windows 10 Pro 14393] Server=[Windows 10 Pro 6.3] + + Sharename Type Comment + --------- ---- ------- + ADMIN$ Disk Administracja zdalna + C$ Disk Domyślny udział + IPC$ IPC Zdalne wywołanie IPC + shared-space Disk + Connection to 10.0.0.100 failed (Error NT_STATUS_RESOURCE_NAME_NOT_FOUND) + NetBIOS over TCP disabled -- no workgroup available + + $ nix-env -e samba + +Then I added the following lines in `/etc/nixos/configuration.nix`: + + # Client for shared folder on Windows Hyper-V host + # Based on: nixpkgs.git/nixos/tests/samba.nix + fileSystems."/vm-share" = { + fsType = "cifs"; + device = "//10.0.0.100/shared-space"; + options = [ "username=shares-guest" "password=ReplaceWithSomeLongRandomlyGeneratedPassword" ]; + }; + networking.interfaces.eth1.ip4 = [{address="10.0.0.101"; prefixLength=28;}]; + From 54e7857eaf82bf824ad8d21eadef470c897a642f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Czapli=C5=84ski?= Date: Fri, 24 Mar 2017 18:05:08 +0100 Subject: [PATCH 034/624] microsoft/hyper-v: add forgotten overcommit_memory --- microsoft/hyper-v-guest.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/microsoft/hyper-v-guest.md b/microsoft/hyper-v-guest.md index 3faa258e851b..f396214e09fd 100644 --- a/microsoft/hyper-v-guest.md +++ b/microsoft/hyper-v-guest.md @@ -15,8 +15,11 @@ with cloning the nixos-hardware repo at this stage): # REQUIRED - see: https://github.com/nixos/nixpkgs/issues/9899 boot.initrd.kernelModules = ["hv_vmbus" "hv_storvsc"]; - # OPTIONAL - use 800x600 resolution for text console, to make it easy to fit on screen + # RECOMMENDED + # - use 800x600 resolution for text console, to make it easy to fit on screen boot.kernelParams = ["video=hyperv_fb:800x600"]; # https://askubuntu.com/a/399960 + # - avoid a problem with `nix-env -i` running out of memory + boot.kernel.sysctl."vm.overcommit_memory" = "1"; # https://github.com/NixOS/nix/issues/421 # UNKNOWN - not sure if below are needed; were suggested for VirtualBox and I used them boot.loader.grub.device = "/dev/sda"; From 3e5b9169cedc84ede8fd8ff3d4b0f28c3f3de72b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 May 2017 11:29:37 +0100 Subject: [PATCH 035/624] add recommend xorg driver for lenovo x250 --- lenovo/x250.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lenovo/x250.nix diff --git a/lenovo/x250.nix b/lenovo/x250.nix new file mode 100644 index 000000000000..345e388a23b7 --- /dev/null +++ b/lenovo/x250.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: + +{ + # modesetting driver leads to freezes with newer kernel at the moment (> 4.4) + services.xserver.videoDrivers = [ "intel" ]; +} From 68e007ae7768711dc2a68f4399a01ec8f5a3ab9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 11 May 2017 11:38:39 +0100 Subject: [PATCH 036/624] x250: enable wheel emulation --- lenovo/x250.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lenovo/x250.nix b/lenovo/x250.nix index 345e388a23b7..40d1fb1edff6 100644 --- a/lenovo/x250.nix +++ b/lenovo/x250.nix @@ -3,4 +3,7 @@ { # modesetting driver leads to freezes with newer kernel at the moment (> 4.4) services.xserver.videoDrivers = [ "intel" ]; + + services.xserver.libinput.enable = true; + hardware.trackpoint.emulateWheel = true; } From 744f289978f78fed123a48b4e88efd06c9caf83b Mon Sep 17 00:00:00 2001 From: Stani Pintjuk Date: Sat, 17 Jun 2017 15:56:16 +0200 Subject: [PATCH 037/624] Add module for ASUS Wireless-AC1300 dongle --- asus/wireless-ac1300.nix | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 asus/wireless-ac1300.nix diff --git a/asus/wireless-ac1300.nix b/asus/wireless-ac1300.nix new file mode 100644 index 000000000000..c60632a943f5 --- /dev/null +++ b/asus/wireless-ac1300.nix @@ -0,0 +1,6 @@ +# Use this module if you use a realtek 18812au based wifi dongle, like ASUS Wireless-AC1300 +{ pkgs, ... }: +{ + boot.extraModulePackages = [ pkgs.linuxPackages.rtl8812au ]; + boot.kernelModules = [ "8812au" ]; +} From ecbb9c15c30af316fa263ba16a6f35dd78b37222 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Wed, 5 Jul 2017 08:46:22 +0930 Subject: [PATCH 038/624] rpi2.nix: pkgs.platforms.raspberrypi2 is no longer correct --- raspberry_pi/rpi2.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/raspberry_pi/rpi2.nix b/raspberry_pi/rpi2.nix index 5744885dc658..897871eb76e2 100644 --- a/raspberry_pi/rpi2.nix +++ b/raspberry_pi/rpi2.nix @@ -20,7 +20,7 @@ In fact I (viric) created the FS into a NBD, not a real SD, to create this image */ -{pkgs, config, ...}: +{ pkgs, config, lib, ...}: { boot.consoleLogLevel = 7; @@ -49,10 +49,16 @@ In fact I (viric) created the FS into a NBD, not a real SD, to create this image services.nixosManual.enable = false; nixpkgs.config = { - platform = pkgs.platforms.raspberrypi2; + # Since https://github.com/NixOS/nixpkgs/commit/f0b634c7e838cdd65ac6f73933c99af3f38d0fa8 + nixpkgs.config.platform = lib.systems.platforms.raspberrypi2; + # Earlier than that, use this: + # platform = pkgs.platforms.raspberrypi2; + # Also be aware of this issue if you're encountering infinite recursion: + # https://github.com/NixOS/nixpkgs/issues/24170 + allowUnfree = true; }; nix.buildCores = 4; nix.binaryCaches = [ ]; -} \ No newline at end of file +} From ae18b6af0fa2a244b2e5932b40885ae4b46abff7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Sep 2017 23:25:33 +0200 Subject: [PATCH 039/624] Initialize general.nix; merge defaults into all ThinkPad configurations --- lenovo/general.nix | 10 ++++++++++ lenovo/t410.nix | 2 ++ lenovo/t440p.nix | 2 ++ lenovo/t460s.nix | 11 +---------- lenovo/x140e.nix | 8 ++------ lenovo/x220i-tablet.nix | 6 ++---- lenovo/x250.nix | 3 ++- lenovo/z510.nix | 3 +++ 8 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 lenovo/general.nix diff --git a/lenovo/general.nix b/lenovo/general.nix new file mode 100644 index 000000000000..51d506032e04 --- /dev/null +++ b/lenovo/general.nix @@ -0,0 +1,10 @@ +{ lib, ... }: + +with lib; + +{ + hardware.trackpoint = mkDefault { + enable = true; + emulateWheel = true; + }; +} diff --git a/lenovo/t410.nix b/lenovo/t410.nix index 912ae66d181e..56e49cb1ef32 100644 --- a/lenovo/t410.nix +++ b/lenovo/t410.nix @@ -1,6 +1,8 @@ { config, pkgs, ... }: { + imports = [ ./general.nix ]; + boot = { kernelParams = [ # Kernel GPU Savings Options (NOTE i915 chipset only) diff --git a/lenovo/t440p.nix b/lenovo/t440p.nix index 47f5f66387bd..af4e7643b131 100644 --- a/lenovo/t440p.nix +++ b/lenovo/t440p.nix @@ -1,6 +1,8 @@ { config, pkgs, ... }: { + imports = [ ./general.nix ]; + boot = { extraModprobeConfig = '' options bbswitch use_acpi_to_detect_card_state=1 diff --git a/lenovo/t460s.nix b/lenovo/t460s.nix index 4aaed1445e36..da7995610dc4 100644 --- a/lenovo/t460s.nix +++ b/lenovo/t460s.nix @@ -3,6 +3,7 @@ { imports = [ ../lib/kernel-version.nix + ./general.nix ]; ## BEGIN from generated hardware-configuration @@ -45,15 +46,5 @@ services.xserver = { libinput.enable = true; synaptics.enable = false; - - config = '' - Section "InputClass" - Identifier "Enable libinput for TrackPoint" - MatchIsPointer "on" - Driver "libinput" - Option "ScrollMethod" "button" - Option "ScrollButton" "8" - EndSection - ''; }; } diff --git a/lenovo/x140e.nix b/lenovo/x140e.nix index f825f44f1970..897d473e42ac 100644 --- a/lenovo/x140e.nix +++ b/lenovo/x140e.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, ... }: { + imports = [ ./general.nix ]; + boot = { # wireless kernelModules = [ "kvm-amd" "wl" ]; @@ -15,12 +17,6 @@ # video card services.xserver.videoDrivers = ["ati"]; - # trackpad (touchpad disabled) - hardware.trackpoint = { - enable = true; - emulateWheel = true; - }; - # media keys sound.enableMediaKeys = true; } diff --git a/lenovo/x220i-tablet.nix b/lenovo/x220i-tablet.nix index 7ea8d735b5cf..700c87cc6804 100644 --- a/lenovo/x220i-tablet.nix +++ b/lenovo/x220i-tablet.nix @@ -1,6 +1,8 @@ { config, pkgs, ... }: { + imports = [ ./general.nix ]; + # TPM chip countains a RNG security.rngd.enable = true; @@ -15,10 +17,6 @@ # hard disk protection if the laptop falls services.hdapsd.enable = true; - # trackpoint support (touchpad disabled in this config) - hardware.trackpoint.enable = true; - hardware.trackpoint.emulateWheel = true; - # alternatively, touchpad with two-finger scrolling #services.xserver.libinput.enable = true; diff --git a/lenovo/x250.nix b/lenovo/x250.nix index 40d1fb1edff6..52a44265b3e6 100644 --- a/lenovo/x250.nix +++ b/lenovo/x250.nix @@ -1,9 +1,10 @@ { config, pkgs, ... }: { + imports = [ ./general.nix ]; + # modesetting driver leads to freezes with newer kernel at the moment (> 4.4) services.xserver.videoDrivers = [ "intel" ]; services.xserver.libinput.enable = true; - hardware.trackpoint.emulateWheel = true; } diff --git a/lenovo/z510.nix b/lenovo/z510.nix index f1f5416b5be6..4c45cac8f67f 100644 --- a/lenovo/z510.nix +++ b/lenovo/z510.nix @@ -1,3 +1,6 @@ +# NOTE: this doesn't inherit from the `general.nix` +# as z510 is not a ThinkPad + { config, pkgs, ... }: { hardware.cpu.intel.updateMicrocode = true; From 7d130c00612ec0ed80586285e030dc9e0e8513ff Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Sep 2017 23:27:33 +0200 Subject: [PATCH 040/624] `hardware.enableAllFirmware = true;` for intel iwlwifi --- lenovo/general.nix | 2 ++ lenovo/t460s.nix | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lenovo/general.nix b/lenovo/general.nix index 51d506032e04..c64566babdf8 100644 --- a/lenovo/general.nix +++ b/lenovo/general.nix @@ -7,4 +7,6 @@ with lib; enable = true; emulateWheel = true; }; + + hardware.enableAllFirmware = true; } diff --git a/lenovo/t460s.nix b/lenovo/t460s.nix index da7995610dc4..9d68cfdec838 100644 --- a/lenovo/t460s.nix +++ b/lenovo/t460s.nix @@ -27,9 +27,6 @@ { version = "4.6"; msg = "Suspending the T460s by closing the lid when running on battery causes the machine to freeze up entirely."; } ]; - # For the wifi (intel iwlwifi) - hardware.enableAllFirmware = true; - # For the screen. I don't know what to do with this information, but # the hiDPI support is far from perfect (as of July 2016): From a2e55b93adf6d19d6d7f6cc831224997de84d7dc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Sep 2017 23:28:34 +0200 Subject: [PATCH 041/624] `services.tlp.enable = true;` for power management --- lenovo/general.nix | 1 + lenovo/x220i-tablet.nix | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lenovo/general.nix b/lenovo/general.nix index c64566babdf8..0afdaafe0226 100644 --- a/lenovo/general.nix +++ b/lenovo/general.nix @@ -9,4 +9,5 @@ with lib; }; hardware.enableAllFirmware = true; + services.tlp.enable = true; } diff --git a/lenovo/x220i-tablet.nix b/lenovo/x220i-tablet.nix index 700c87cc6804..068baa852ecb 100644 --- a/lenovo/x220i-tablet.nix +++ b/lenovo/x220i-tablet.nix @@ -11,9 +11,6 @@ extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; }; - # TLP Linux Advanced Power Management - services.tlp.enable = true; - # hard disk protection if the laptop falls services.hdapsd.enable = true; From ed46b99315a10254dfa4753423b45c1782465647 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Sep 2017 23:31:08 +0200 Subject: [PATCH 042/624] Use `libinput` as touchpad driver The recommended driver is libinput, furthermore the packaging of synaptics is officially deprecated in NixOS: https://github.com/NixOS/nixpkgs/commit/9d2777a5a5f861a727d09c3ecdeffd8c72c143b7 --- lenovo/general.nix | 5 +++++ lenovo/t460s.nix | 7 ------- lenovo/x220i-tablet.nix | 3 --- lenovo/x250.nix | 2 -- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lenovo/general.nix b/lenovo/general.nix index 0afdaafe0226..f539cc2a546f 100644 --- a/lenovo/general.nix +++ b/lenovo/general.nix @@ -10,4 +10,9 @@ with lib; hardware.enableAllFirmware = true; services.tlp.enable = true; + + services.xserver = { + synaptics.enable = false; + libinput.enable = true; + }; } diff --git a/lenovo/t460s.nix b/lenovo/t460s.nix index 9d68cfdec838..a274b374e957 100644 --- a/lenovo/t460s.nix +++ b/lenovo/t460s.nix @@ -37,11 +37,4 @@ # Aspect Ratio: 16 × 9 (1.78:1) # Pixel Count: 3,686,400 # Megapixels: 3.69MP - - # Use libinput to let the physical middle button be used to scroll - # with the trackpoint - services.xserver = { - libinput.enable = true; - synaptics.enable = false; - }; } diff --git a/lenovo/x220i-tablet.nix b/lenovo/x220i-tablet.nix index 068baa852ecb..3c729baa670d 100644 --- a/lenovo/x220i-tablet.nix +++ b/lenovo/x220i-tablet.nix @@ -14,9 +14,6 @@ # hard disk protection if the laptop falls services.hdapsd.enable = true; - # alternatively, touchpad with two-finger scrolling - #services.xserver.libinput.enable = true; - # enable volume control buttons sound.enableMediaKeys = true; diff --git a/lenovo/x250.nix b/lenovo/x250.nix index 52a44265b3e6..8ab1aa598ce0 100644 --- a/lenovo/x250.nix +++ b/lenovo/x250.nix @@ -5,6 +5,4 @@ # modesetting driver leads to freezes with newer kernel at the moment (> 4.4) services.xserver.videoDrivers = [ "intel" ]; - - services.xserver.libinput.enable = true; } From d977cf26de7f1b0ffe3cff39b1c2801aac0e695b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 Sep 2017 23:34:57 +0200 Subject: [PATCH 043/624] Segregate `lenovo/` subdir into `thinkpad` and `ideapad` directories There are several significant differences between ThinkPads and the other Lenovo models, so this structure must be more precise --- lenovo/{ => ideapad}/z510.nix | 0 lenovo/{ => thinkpad}/general.nix | 0 lenovo/{ => thinkpad}/t410.nix | 0 lenovo/{ => thinkpad}/t440p.nix | 0 lenovo/{ => thinkpad}/t460s.nix | 0 lenovo/{ => thinkpad}/x140e.nix | 0 lenovo/{ => thinkpad}/x220i-tablet.nix | 0 lenovo/{ => thinkpad}/x250.nix | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename lenovo/{ => ideapad}/z510.nix (100%) rename lenovo/{ => thinkpad}/general.nix (100%) rename lenovo/{ => thinkpad}/t410.nix (100%) rename lenovo/{ => thinkpad}/t440p.nix (100%) rename lenovo/{ => thinkpad}/t460s.nix (100%) rename lenovo/{ => thinkpad}/x140e.nix (100%) rename lenovo/{ => thinkpad}/x220i-tablet.nix (100%) rename lenovo/{ => thinkpad}/x250.nix (100%) diff --git a/lenovo/z510.nix b/lenovo/ideapad/z510.nix similarity index 100% rename from lenovo/z510.nix rename to lenovo/ideapad/z510.nix diff --git a/lenovo/general.nix b/lenovo/thinkpad/general.nix similarity index 100% rename from lenovo/general.nix rename to lenovo/thinkpad/general.nix diff --git a/lenovo/t410.nix b/lenovo/thinkpad/t410.nix similarity index 100% rename from lenovo/t410.nix rename to lenovo/thinkpad/t410.nix diff --git a/lenovo/t440p.nix b/lenovo/thinkpad/t440p.nix similarity index 100% rename from lenovo/t440p.nix rename to lenovo/thinkpad/t440p.nix diff --git a/lenovo/t460s.nix b/lenovo/thinkpad/t460s.nix similarity index 100% rename from lenovo/t460s.nix rename to lenovo/thinkpad/t460s.nix diff --git a/lenovo/x140e.nix b/lenovo/thinkpad/x140e.nix similarity index 100% rename from lenovo/x140e.nix rename to lenovo/thinkpad/x140e.nix diff --git a/lenovo/x220i-tablet.nix b/lenovo/thinkpad/x220i-tablet.nix similarity index 100% rename from lenovo/x220i-tablet.nix rename to lenovo/thinkpad/x220i-tablet.nix diff --git a/lenovo/x250.nix b/lenovo/thinkpad/x250.nix similarity index 100% rename from lenovo/x250.nix rename to lenovo/thinkpad/x250.nix From 5340bd39d174c55b1d5fc17d410cebb54ad6bd5b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 Sep 2017 09:45:30 +0200 Subject: [PATCH 044/624] Don't enable non-dedistributable firmware by default --- lenovo/thinkpad/general.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/general.nix index f539cc2a546f..628e5ab5e74a 100644 --- a/lenovo/thinkpad/general.nix +++ b/lenovo/thinkpad/general.nix @@ -8,7 +8,7 @@ with lib; emulateWheel = true; }; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = mkDefault true; services.tlp.enable = true; services.xserver = { From 0116223524393e40518c62e5616bf918d9338bd7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 Sep 2017 09:49:11 +0200 Subject: [PATCH 045/624] Add `pkgs.acpi` to gather battery status information --- lenovo/thinkpad/general.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/general.nix index 628e5ab5e74a..7b6e8eb41e9c 100644 --- a/lenovo/thinkpad/general.nix +++ b/lenovo/thinkpad/general.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ pkgs, lib, ... }: with lib; @@ -15,4 +15,6 @@ with lib; synaptics.enable = false; libinput.enable = true; }; + + environment.systemPackages = [ pkgs.acpi ]; } From 356ebeaaf77f2019c0c5d6756ec8ded4cabd1353 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 Sep 2017 10:01:01 +0200 Subject: [PATCH 046/624] Introduce `general-intel.nix` for defaults with Intel CPU The x1xx series relies on a AMD CPU, but all other (currently supported) ThinkPads use an Intel CPU, so `general-intel.nix` is responsible for all Intel defaults. --- lenovo/thinkpad/general-intel.nix | 6 ++++++ lenovo/thinkpad/t410.nix | 2 +- lenovo/thinkpad/t440p.nix | 4 ++-- lenovo/thinkpad/t460s.nix | 2 +- lenovo/thinkpad/x220i-tablet.nix | 2 +- lenovo/thinkpad/x250.nix | 5 +---- 6 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 lenovo/thinkpad/general-intel.nix diff --git a/lenovo/thinkpad/general-intel.nix b/lenovo/thinkpad/general-intel.nix new file mode 100644 index 000000000000..5aeec181ae05 --- /dev/null +++ b/lenovo/thinkpad/general-intel.nix @@ -0,0 +1,6 @@ +{ ... }: + +{ + boot.kernelModules = mkDefault [ "kvm-intel" ]; + services.xserver.videoDrivers = [ "intel" ]; +} diff --git a/lenovo/thinkpad/t410.nix b/lenovo/thinkpad/t410.nix index 56e49cb1ef32..5737cc691aae 100644 --- a/lenovo/thinkpad/t410.nix +++ b/lenovo/thinkpad/t410.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - imports = [ ./general.nix ]; + imports = [ ./general-intel.nix ]; boot = { kernelParams = [ diff --git a/lenovo/thinkpad/t440p.nix b/lenovo/thinkpad/t440p.nix index af4e7643b131..4d96bbb2c58d 100644 --- a/lenovo/thinkpad/t440p.nix +++ b/lenovo/thinkpad/t440p.nix @@ -1,12 +1,12 @@ { config, pkgs, ... }: { - imports = [ ./general.nix ]; + imports = [ ./general-intel.nix ]; boot = { extraModprobeConfig = '' options bbswitch use_acpi_to_detect_card_state=1 ''; - kernelModules = [ "kvm-intel" "tpm-rng" ]; + kernelModules = [ "tpm-rng" ]; }; } diff --git a/lenovo/thinkpad/t460s.nix b/lenovo/thinkpad/t460s.nix index a274b374e957..d6f2ba3d5061 100644 --- a/lenovo/thinkpad/t460s.nix +++ b/lenovo/thinkpad/t460s.nix @@ -3,7 +3,7 @@ { imports = [ ../lib/kernel-version.nix - ./general.nix + ./general-intel.nix ]; ## BEGIN from generated hardware-configuration diff --git a/lenovo/thinkpad/x220i-tablet.nix b/lenovo/thinkpad/x220i-tablet.nix index 3c729baa670d..65a4a3d29c26 100644 --- a/lenovo/thinkpad/x220i-tablet.nix +++ b/lenovo/thinkpad/x220i-tablet.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - imports = [ ./general.nix ]; + imports = [ ./general-intel.nix ]; # TPM chip countains a RNG security.rngd.enable = true; diff --git a/lenovo/thinkpad/x250.nix b/lenovo/thinkpad/x250.nix index 8ab1aa598ce0..200327f9c928 100644 --- a/lenovo/thinkpad/x250.nix +++ b/lenovo/thinkpad/x250.nix @@ -1,8 +1,5 @@ { config, pkgs, ... }: { - imports = [ ./general.nix ]; - - # modesetting driver leads to freezes with newer kernel at the moment (> 4.4) - services.xserver.videoDrivers = [ "intel" ]; + imports = [ ./general-intel.nix ]; } From 348f0466b524987d9310d7ecf5df5fac0dc372be Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 21 Sep 2017 00:09:48 +0200 Subject: [PATCH 047/624] x250 can be configured using all defaults --- lenovo/thinkpad/x250.nix | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 lenovo/thinkpad/x250.nix diff --git a/lenovo/thinkpad/x250.nix b/lenovo/thinkpad/x250.nix deleted file mode 100644 index 200327f9c928..000000000000 --- a/lenovo/thinkpad/x250.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, pkgs, ... }: - -{ - imports = [ ./general-intel.nix ]; -} From 12f5a724cec2b7fcd69ac2d1e7320a24c2d434aa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 21 Sep 2017 00:11:34 +0200 Subject: [PATCH 048/624] `sound.enableMediaKeys` can be used on all ThinkPads --- lenovo/thinkpad/general.nix | 2 ++ lenovo/thinkpad/x140e.nix | 3 --- lenovo/thinkpad/x220i-tablet.nix | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/general.nix index 7b6e8eb41e9c..0c0e9252dc4d 100644 --- a/lenovo/thinkpad/general.nix +++ b/lenovo/thinkpad/general.nix @@ -17,4 +17,6 @@ with lib; }; environment.systemPackages = [ pkgs.acpi ]; + + sound.enableMediaKeys = true; } diff --git a/lenovo/thinkpad/x140e.nix b/lenovo/thinkpad/x140e.nix index 897d473e42ac..df1f7f30e574 100644 --- a/lenovo/thinkpad/x140e.nix +++ b/lenovo/thinkpad/x140e.nix @@ -16,7 +16,4 @@ # video card services.xserver.videoDrivers = ["ati"]; - - # media keys - sound.enableMediaKeys = true; } diff --git a/lenovo/thinkpad/x220i-tablet.nix b/lenovo/thinkpad/x220i-tablet.nix index 65a4a3d29c26..c87df3ff754c 100644 --- a/lenovo/thinkpad/x220i-tablet.nix +++ b/lenovo/thinkpad/x220i-tablet.nix @@ -14,9 +14,6 @@ # hard disk protection if the laptop falls services.hdapsd.enable = true; - # enable volume control buttons - sound.enableMediaKeys = true; - # fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) #services.fprintd.enable = true; #security.pam.services.login.fprintAuth = true; From 7f194802c5a5b6be828eb4fc952d84ac5e84fe17 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Sun, 24 Sep 2017 15:19:52 +0100 Subject: [PATCH 049/624] Add file for macbook pro 12,1 with suspend fix. --- apple/macbook-pro-12-1.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 apple/macbook-pro-12-1.nix diff --git a/apple/macbook-pro-12-1.nix b/apple/macbook-pro-12-1.nix new file mode 100644 index 000000000000..c755ce00e7cc --- /dev/null +++ b/apple/macbook-pro-12-1.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: +{ + imports = + [ + + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + # The USB subsystem wakes up the MBP directly after suspend if + # we don't disable it. + services.udev.extraRules = '' + SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled" + ''; +} From a0e35e53069bd0026165adaf0d6e1a1b8542384e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 Oct 2017 13:56:33 +0200 Subject: [PATCH 050/624] Use `mkDefault` to avoid make override easier --- lenovo/thinkpad/general.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/general.nix index 0c0e9252dc4d..71db23a4a2d8 100644 --- a/lenovo/thinkpad/general.nix +++ b/lenovo/thinkpad/general.nix @@ -11,12 +11,12 @@ with lib; hardware.enableRedistributableFirmware = mkDefault true; services.tlp.enable = true; - services.xserver = { + services.xserver = mkDefault { synaptics.enable = false; libinput.enable = true; }; environment.systemPackages = [ pkgs.acpi ]; - sound.enableMediaKeys = true; + sound.enableMediaKeys = mkDefault true; } From 440088677b4e6f9527466cbc5b02abf2bf3f863d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 22 Dec 2017 02:56:28 +0000 Subject: [PATCH 051/624] lenovo: minor cosmetic changes --- lenovo/ideapad/z510.nix | 6 ++---- lenovo/thinkpad/general-intel.nix | 2 -- lenovo/thinkpad/general.nix | 6 ++++-- lenovo/thinkpad/t410.nix | 21 ++++++++++++++++----- lenovo/thinkpad/t460s.nix | 8 ++++---- lenovo/thinkpad/x140e.nix | 2 +- lenovo/thinkpad/x220i-tablet.nix | 2 +- 7 files changed, 28 insertions(+), 19 deletions(-) diff --git a/lenovo/ideapad/z510.nix b/lenovo/ideapad/z510.nix index 4c45cac8f67f..6cc6dc6c17c1 100644 --- a/lenovo/ideapad/z510.nix +++ b/lenovo/ideapad/z510.nix @@ -1,10 +1,8 @@ -# NOTE: this doesn't inherit from the `general.nix` -# as z510 is not a ThinkPad - { config, pkgs, ... }: + { hardware.cpu.intel.updateMicrocode = true; - + # see https://github.com/NixOS/nixpkgs/issues/18356 # found buggy driver with method https://wiki.ubuntu.com/DebuggingKernelSuspend boot.blacklistedKernelModules = [ "nouveau" ]; diff --git a/lenovo/thinkpad/general-intel.nix b/lenovo/thinkpad/general-intel.nix index 5aeec181ae05..5b9412477854 100644 --- a/lenovo/thinkpad/general-intel.nix +++ b/lenovo/thinkpad/general-intel.nix @@ -1,5 +1,3 @@ -{ ... }: - { boot.kernelModules = mkDefault [ "kvm-intel" ]; services.xserver.videoDrivers = [ "intel" ]; diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/general.nix index 71db23a4a2d8..00f3c3ab232c 100644 --- a/lenovo/thinkpad/general.nix +++ b/lenovo/thinkpad/general.nix @@ -1,6 +1,8 @@ -{ pkgs, lib, ... }: +{ lib, pkgs, ... }: -with lib; +let + inherit (lib) mkDefault; +in { hardware.trackpoint = mkDefault { diff --git a/lenovo/thinkpad/t410.nix b/lenovo/thinkpad/t410.nix index 5737cc691aae..53c731f8c2d5 100644 --- a/lenovo/thinkpad/t410.nix +++ b/lenovo/thinkpad/t410.nix @@ -6,11 +6,22 @@ boot = { kernelParams = [ # Kernel GPU Savings Options (NOTE i915 chipset only) - "drm.debug=0" "drm.vblankoffdelay=1" "i915.semaphores=1" "i915.modeset=1" - "i915.use_mmio_flip=1" "i915.powersave=1" "i915.enable_ips=1" - "i915.disable_power_well=1" "i915.enable_hangcheck=1" - "i915.enable_cmd_parser=1" "i915.fastboot=0" "i915.enable_ppgtt=1" - "i915.reset=0" "i915.lvds_use_ssc=0" "i915.enable_psr=0" "vblank_mode=0" + "drm.debug=0" + "drm.vblankoffdelay=1" + "i915.semaphores=1" + "i915.modeset=1" + "i915.use_mmio_flip=1" + "i915.powersave=1" + "i915.enable_ips=1" + "i915.disable_power_well=1" + "i915.enable_hangcheck=1" + "i915.enable_cmd_parser=1" + "i915.fastboot=0" + "i915.enable_ppgtt=1" + "i915.reset=0" + "i915.lvds_use_ssc=0" + "i915.enable_psr=0" + "vblank_mode=0" "i915.i915_enable_rc6=1" ]; blacklistedKernelModules = [ diff --git a/lenovo/thinkpad/t460s.nix b/lenovo/thinkpad/t460s.nix index d6f2ba3d5061..dc09fd2e131f 100644 --- a/lenovo/thinkpad/t460s.nix +++ b/lenovo/thinkpad/t460s.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: { - imports = - [ ../lib/kernel-version.nix - ./general-intel.nix - ]; + imports = [ + ../lib/kernel-version.nix + ./general-intel.nix + ]; ## BEGIN from generated hardware-configuration ## Probably better to just use a freshly generated hardware.configuration.nix diff --git a/lenovo/thinkpad/x140e.nix b/lenovo/thinkpad/x140e.nix index df1f7f30e574..efa510674980 100644 --- a/lenovo/thinkpad/x140e.nix +++ b/lenovo/thinkpad/x140e.nix @@ -15,5 +15,5 @@ }; # video card - services.xserver.videoDrivers = ["ati"]; + services.xserver.videoDrivers = [ "ati" ]; } diff --git a/lenovo/thinkpad/x220i-tablet.nix b/lenovo/thinkpad/x220i-tablet.nix index c87df3ff754c..9f9638a140df 100644 --- a/lenovo/thinkpad/x220i-tablet.nix +++ b/lenovo/thinkpad/x220i-tablet.nix @@ -8,7 +8,7 @@ boot = { kernelModules = [ "tp_smapi" ]; - extraModulePackages = [ config.boot.kernelPackages.tp_smapi ]; + extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; }; # hard disk protection if the laptop falls From a6f8e4bbc0bd2e1e98590545d5fd3929d4dc55e0 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 22 Dec 2017 03:02:07 +0000 Subject: [PATCH 052/624] thinkpad: remove various assumptions * hardware.trackpoint.emulateWheel = true; is very biased, this module is only for ThinkPads anyway, so default value should be used * All options that should be overridable (e.g. services.tlp.enable) * Hardware profile should not pull in stuff into system environment unless it's hardware-specific (pkgs.acpi is not) * sound.mediaKeys clashes with DE, e.g. Xfce handling sound keys * Drop redundant synaptics.enable = false; --- lenovo/thinkpad/general.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/general.nix index 00f3c3ab232c..cb800012c371 100644 --- a/lenovo/thinkpad/general.nix +++ b/lenovo/thinkpad/general.nix @@ -5,20 +5,7 @@ let in { - hardware.trackpoint = mkDefault { - enable = true; - emulateWheel = true; - }; - - hardware.enableRedistributableFirmware = mkDefault true; - services.tlp.enable = true; - - services.xserver = mkDefault { - synaptics.enable = false; - libinput.enable = true; - }; - - environment.systemPackages = [ pkgs.acpi ]; - - sound.enableMediaKeys = mkDefault true; + hardware.trackpoint.enable = mkDefault true; + services.tlp.enable = mkDefault true; + services.xserver.libinput.enable = mkDefault true; } From d4688911b7856e69368d4d20e27bf9fb6e4d8d9c Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 22 Dec 2017 13:33:54 +0300 Subject: [PATCH 053/624] treewide: drop hardware-configuration.nix boilerplate (#28) hardware-configuration.nix is still relied upon for hard drive configuration, and it handles variations of hardware (custom configurations, subrevisions). --- apple/macbook-pro-10-1.nix | 14 -------------- dell/xps-15-9550.nix | 15 --------------- lenovo/thinkpad/t460s.nix | 11 ----------- 3 files changed, 40 deletions(-) diff --git a/apple/macbook-pro-10-1.nix b/apple/macbook-pro-10-1.nix index f9ba24de4ec8..797404eddcf8 100644 --- a/apple/macbook-pro-10-1.nix +++ b/apple/macbook-pro-10-1.nix @@ -5,20 +5,6 @@ [ ../lib/kernel-version.nix ]; - ## BEGIN from generated hardware-configuration - ## Probably better to just use a freshly generated hardware.configuration.nix - ## than this, but including for reference. - #imports = - # [ - # ]; - # - #boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" "sdhci_pci" ]; - #boot.kernelModules = [ "kvm-intel" "wl" ]; - #boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; - # - #nix.maxJobs = lib.mkDefault 8; - ## END from generated hardware-configuration - # Use the systemd-boot efi boot loader. (From default generated configuration.nix) boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/dell/xps-15-9550.nix b/dell/xps-15-9550.nix index ac935acc5be6..04f717422585 100644 --- a/dell/xps-15-9550.nix +++ b/dell/xps-15-9550.nix @@ -5,21 +5,6 @@ [ ../lib/kernel-version.nix ]; - ## BEGIN from generated hardware-configuration - ## Probably better to just use a freshly generated hardware.configuration.nix - ## than this, but including for reference. - #imports = - # [ - # - # ]; - # - #boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "rtsx_pci_sdmmc" ]; - #boot.kernelModules = [ "kvm-intel" ]; - #boot.extraModulePackages = [ ]; - # - #nix.maxJobs = 8; - ## END from generated hardware-configuration - # Use the systemd-boot efi boot loader. (From default generated configuration.nix) boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/lenovo/thinkpad/t460s.nix b/lenovo/thinkpad/t460s.nix index d6f2ba3d5061..fbcdef7a4577 100644 --- a/lenovo/thinkpad/t460s.nix +++ b/lenovo/thinkpad/t460s.nix @@ -6,17 +6,6 @@ ./general-intel.nix ]; - ## BEGIN from generated hardware-configuration - ## Probably better to just use a freshly generated hardware.configuration.nix - ## than this, but including for reference. - # boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - # boot.kernelModules = [ "kvm-intel" ]; - # boot.extraModulePackages = [ ]; - # - # - # nix.maxJobs = lib.mkDefault 4; - ## END from generated hardware-configuration - # Use the gummiboot efi boot loader. (From default generated configuration.nix) boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; From 3c9f432a7146115b2d0b6200c4c19101c29caaba Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 22 Dec 2017 20:17:00 +0300 Subject: [PATCH 054/624] treewide: modules -> profiles, separate dirs, list in README (#29) Enforce proper naming: all paths are lowercase and hyphen-separated, if there's a line of models (aspire, macbook-pro, thinkpad) it becomes a subdirectory. Documentation for profiles is moved to README files in respective directories. Add an Org mode table that lists all available profiles and their paths. Instead of fetching repo locally, use a Nix channel. Making hardware profiles read-only should improve quality and amount of participation long-term. --- README.md | 24 ---------- README.org | 47 +++++++++++++++++++ acer/{4810t.wiki => aspire/4810t/README.wiki} | 0 acer/{4810t.nix => aspire/4810t/default.nix} | 0 acer/{c720.wiki => c720/README.wiki} | 0 acer/{c720.nix => c720/default.nix} | 0 airis/{n990.nix => n990/default.nix} | 0 .../10-1/README.wiki} | 0 .../10-1/default.nix} | 0 .../12-1/default.nix} | 0 .../README.wiki} | 0 asus/wireless-ac1300.nix | 2 + .../15-9550/README.wiki} | 0 .../15-9550/default.nix} | 0 .../{configuration.nix => default.nix} | 0 lenovo/ideapad/{z510.nix => z510/default.nix} | 0 lenovo/thinkpad/{general.nix => common.nix} | 0 .../thinkpad/{general-intel.nix => intel.nix} | 0 .../thinkpad/{t410.nix => t410/default.nix} | 2 +- .../thinkpad/{t440p.nix => t440p/default.nix} | 2 +- .../thinkpad/{t460s.nix => t460s/default.nix} | 0 .../thinkpad/{x140e.nix => x140e/default.nix} | 2 +- .../{x220i-tablet.nix => x220/default.nix} | 2 +- .../{hyper-v-guest.md => hyper-v/README.md} | 0 .../3/README.wiki} | 0 .../3/default.nix} | 0 .../rpi2.nix => raspberry-pi/2/default.nix | 0 .../{np900x3c.wiki => np900x3c/README.wiki} | 0 .../{np900x3c.nix => np900x3c/default.nix} | 0 .../default.nix} | 0 .../{x10sll-f.nix => x10sll-f/default.nix} | 0 31 files changed, 53 insertions(+), 28 deletions(-) delete mode 100644 README.md create mode 100644 README.org rename acer/{4810t.wiki => aspire/4810t/README.wiki} (100%) rename acer/{4810t.nix => aspire/4810t/default.nix} (100%) rename acer/{c720.wiki => c720/README.wiki} (100%) rename acer/{c720.nix => c720/default.nix} (100%) rename airis/{n990.nix => n990/default.nix} (100%) rename apple/{macbook-pro-10-1.wiki => macbook-pro/10-1/README.wiki} (100%) rename apple/{macbook-pro-10-1.nix => macbook-pro/10-1/default.nix} (100%) rename apple/{macbook-pro-12-1.nix => macbook-pro/12-1/default.nix} (100%) rename asus/{m60j-jx041v.wiki => m60j-jx041v/README.wiki} (100%) rename dell/{xps-15-9550.wiki => xps/15-9550/README.wiki} (100%) rename dell/{xps-15-9550.nix => xps/15-9550/default.nix} (100%) rename inversepath/usbarmory/{configuration.nix => default.nix} (100%) rename lenovo/ideapad/{z510.nix => z510/default.nix} (100%) rename lenovo/thinkpad/{general.nix => common.nix} (100%) rename lenovo/thinkpad/{general-intel.nix => intel.nix} (100%) rename lenovo/thinkpad/{t410.nix => t410/default.nix} (99%) rename lenovo/thinkpad/{t440p.nix => t440p/default.nix} (82%) rename lenovo/thinkpad/{t460s.nix => t460s/default.nix} (100%) rename lenovo/thinkpad/{x140e.nix => x140e/default.nix} (91%) rename lenovo/thinkpad/{x220i-tablet.nix => x220/default.nix} (93%) rename microsoft/{hyper-v-guest.md => hyper-v/README.md} (100%) rename microsoft/{surface_pro_3.wiki => surface-pro/3/README.wiki} (100%) rename microsoft/{surface_pro_3.nix => surface-pro/3/default.nix} (100%) rename raspberry_pi/rpi2.nix => raspberry-pi/2/default.nix (100%) rename samsung/{np900x3c.wiki => np900x3c/README.wiki} (100%) rename samsung/{np900x3c.nix => np900x3c/default.nix} (100%) rename supermicro/{a1sri-2758f.nix => a1sri-2758f/default.nix} (100%) rename supermicro/{x10sll-f.nix => x10sll-f/default.nix} (100%) diff --git a/README.md b/README.md deleted file mode 100644 index f697a7b2dec2..000000000000 --- a/README.md +++ /dev/null @@ -1,24 +0,0 @@ -A collection of NixOS modules covering hardware quirks. - -## Usage -The simplest way to use this repo for now is to clone locally and include by path: -``` nix -{ config, pkgs, ... }: - -{ - imports = - [ /home/user/nixos-hardware/acme/thunkpad-2000.nix ]; -} -``` - -Modules should favor usability and stability, so performance hacks -should be activated by an additional a NixOS option or conservative -and performance configs can be declared in seperate modules. - -Because modules can only be tested with the appropriate hardware, -quality assurance is up to **you**. - -## Simple tips and tricks - -### Disable PC speaker -```boot.blacklistedKernelModules = [ "pcspkr" ];``` diff --git a/README.org b/README.org new file mode 100644 index 000000000000..97df02cd3171 --- /dev/null +++ b/README.org @@ -0,0 +1,47 @@ +NixOS profiles covering hardware quirks. + +Add a new channel: + + : $ sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware + : $ sudo nix-channel --update nixos-hardware + +Then add an appropriate profile path to ~imports~ in +~/etc/nixos/configuration.nix~. Currently available profiles: + +| Model | Path | +|---------------------------+--------------------------------------------| +| Acer Aspire 4810T | ~~ | +| Acer C720 | ~~ | +| Airis N990 | ~~ | +| Apple MacBook Pro 10,1 | ~~ | +| Apple MacBook Pro 12,1 | ~~ | +| Dell XPS 15 9550 | ~~ | +| Inverse Path USB armory | ~~ | +| Lenovo IdeaPad Z510 | ~~ | +| Lenovo ThinkPad T410 | ~~ | +| Lenovo ThinkPad T440p | ~~ | +| Lenovo ThinkPad T460s | ~~ | +| Lenovo ThinkPad X140e | ~~ | +| Lenovo ThinkPad X220 | ~~ | +| Microsoft Surface Pro 3 | ~~ | +| Raspberry Pi 2 | ~~ | +| Samsung Series 9 NP900X3C | ~~ | +| Supermicro A1SRi-2758F | ~~ | +| Supermicro X10SLL-F | ~~ | + +For example, to enable ThinkPad X220 profile, your ~imports~ should look like: + + : imports = [ ./hardware-configuration.nix ]; + +Profiles should favor usability and stability, so performance hacks should be +activated by an additional NixOS option or conservative and performance configs +can be declared in seperate profiles. + +Because profiles can only be tested with the appropriate hardware, quality +assurance is up to *you*. + +** Simple tips and tricks + +*** Disable PC speaker + + : boot.blacklistedKernelModules = [ "pcspkr" ]; diff --git a/acer/4810t.wiki b/acer/aspire/4810t/README.wiki similarity index 100% rename from acer/4810t.wiki rename to acer/aspire/4810t/README.wiki diff --git a/acer/4810t.nix b/acer/aspire/4810t/default.nix similarity index 100% rename from acer/4810t.nix rename to acer/aspire/4810t/default.nix diff --git a/acer/c720.wiki b/acer/c720/README.wiki similarity index 100% rename from acer/c720.wiki rename to acer/c720/README.wiki diff --git a/acer/c720.nix b/acer/c720/default.nix similarity index 100% rename from acer/c720.nix rename to acer/c720/default.nix diff --git a/airis/n990.nix b/airis/n990/default.nix similarity index 100% rename from airis/n990.nix rename to airis/n990/default.nix diff --git a/apple/macbook-pro-10-1.wiki b/apple/macbook-pro/10-1/README.wiki similarity index 100% rename from apple/macbook-pro-10-1.wiki rename to apple/macbook-pro/10-1/README.wiki diff --git a/apple/macbook-pro-10-1.nix b/apple/macbook-pro/10-1/default.nix similarity index 100% rename from apple/macbook-pro-10-1.nix rename to apple/macbook-pro/10-1/default.nix diff --git a/apple/macbook-pro-12-1.nix b/apple/macbook-pro/12-1/default.nix similarity index 100% rename from apple/macbook-pro-12-1.nix rename to apple/macbook-pro/12-1/default.nix diff --git a/asus/m60j-jx041v.wiki b/asus/m60j-jx041v/README.wiki similarity index 100% rename from asus/m60j-jx041v.wiki rename to asus/m60j-jx041v/README.wiki diff --git a/asus/wireless-ac1300.nix b/asus/wireless-ac1300.nix index c60632a943f5..a3122a78a46e 100644 --- a/asus/wireless-ac1300.nix +++ b/asus/wireless-ac1300.nix @@ -1,5 +1,7 @@ # Use this module if you use a realtek 18812au based wifi dongle, like ASUS Wireless-AC1300 + { pkgs, ... }: + { boot.extraModulePackages = [ pkgs.linuxPackages.rtl8812au ]; boot.kernelModules = [ "8812au" ]; diff --git a/dell/xps-15-9550.wiki b/dell/xps/15-9550/README.wiki similarity index 100% rename from dell/xps-15-9550.wiki rename to dell/xps/15-9550/README.wiki diff --git a/dell/xps-15-9550.nix b/dell/xps/15-9550/default.nix similarity index 100% rename from dell/xps-15-9550.nix rename to dell/xps/15-9550/default.nix diff --git a/inversepath/usbarmory/configuration.nix b/inversepath/usbarmory/default.nix similarity index 100% rename from inversepath/usbarmory/configuration.nix rename to inversepath/usbarmory/default.nix diff --git a/lenovo/ideapad/z510.nix b/lenovo/ideapad/z510/default.nix similarity index 100% rename from lenovo/ideapad/z510.nix rename to lenovo/ideapad/z510/default.nix diff --git a/lenovo/thinkpad/general.nix b/lenovo/thinkpad/common.nix similarity index 100% rename from lenovo/thinkpad/general.nix rename to lenovo/thinkpad/common.nix diff --git a/lenovo/thinkpad/general-intel.nix b/lenovo/thinkpad/intel.nix similarity index 100% rename from lenovo/thinkpad/general-intel.nix rename to lenovo/thinkpad/intel.nix diff --git a/lenovo/thinkpad/t410.nix b/lenovo/thinkpad/t410/default.nix similarity index 99% rename from lenovo/thinkpad/t410.nix rename to lenovo/thinkpad/t410/default.nix index 53c731f8c2d5..53d5515c77c7 100644 --- a/lenovo/thinkpad/t410.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - imports = [ ./general-intel.nix ]; + imports = [ ../intel.nix ]; boot = { kernelParams = [ diff --git a/lenovo/thinkpad/t440p.nix b/lenovo/thinkpad/t440p/default.nix similarity index 82% rename from lenovo/thinkpad/t440p.nix rename to lenovo/thinkpad/t440p/default.nix index 4d96bbb2c58d..5c8699dffbe2 100644 --- a/lenovo/thinkpad/t440p.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - imports = [ ./general-intel.nix ]; + imports = [ ../intel.nix ]; boot = { extraModprobeConfig = '' diff --git a/lenovo/thinkpad/t460s.nix b/lenovo/thinkpad/t460s/default.nix similarity index 100% rename from lenovo/thinkpad/t460s.nix rename to lenovo/thinkpad/t460s/default.nix diff --git a/lenovo/thinkpad/x140e.nix b/lenovo/thinkpad/x140e/default.nix similarity index 91% rename from lenovo/thinkpad/x140e.nix rename to lenovo/thinkpad/x140e/default.nix index efa510674980..a6fb02a9e886 100644 --- a/lenovo/thinkpad/x140e.nix +++ b/lenovo/thinkpad/x140e/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - imports = [ ./general.nix ]; + imports = [ ../common.nix ]; boot = { # wireless diff --git a/lenovo/thinkpad/x220i-tablet.nix b/lenovo/thinkpad/x220/default.nix similarity index 93% rename from lenovo/thinkpad/x220i-tablet.nix rename to lenovo/thinkpad/x220/default.nix index 9f9638a140df..3a9e99b4b344 100644 --- a/lenovo/thinkpad/x220i-tablet.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - imports = [ ./general-intel.nix ]; + imports = [ ../intel.nix ]; # TPM chip countains a RNG security.rngd.enable = true; diff --git a/microsoft/hyper-v-guest.md b/microsoft/hyper-v/README.md similarity index 100% rename from microsoft/hyper-v-guest.md rename to microsoft/hyper-v/README.md diff --git a/microsoft/surface_pro_3.wiki b/microsoft/surface-pro/3/README.wiki similarity index 100% rename from microsoft/surface_pro_3.wiki rename to microsoft/surface-pro/3/README.wiki diff --git a/microsoft/surface_pro_3.nix b/microsoft/surface-pro/3/default.nix similarity index 100% rename from microsoft/surface_pro_3.nix rename to microsoft/surface-pro/3/default.nix diff --git a/raspberry_pi/rpi2.nix b/raspberry-pi/2/default.nix similarity index 100% rename from raspberry_pi/rpi2.nix rename to raspberry-pi/2/default.nix diff --git a/samsung/np900x3c.wiki b/samsung/np900x3c/README.wiki similarity index 100% rename from samsung/np900x3c.wiki rename to samsung/np900x3c/README.wiki diff --git a/samsung/np900x3c.nix b/samsung/np900x3c/default.nix similarity index 100% rename from samsung/np900x3c.nix rename to samsung/np900x3c/default.nix diff --git a/supermicro/a1sri-2758f.nix b/supermicro/a1sri-2758f/default.nix similarity index 100% rename from supermicro/a1sri-2758f.nix rename to supermicro/a1sri-2758f/default.nix diff --git a/supermicro/x10sll-f.nix b/supermicro/x10sll-f/default.nix similarity index 100% rename from supermicro/x10sll-f.nix rename to supermicro/x10sll-f/default.nix From b8ab6ab37f2510990f35ea7594df7f8d7167df8f Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 00:46:26 +0000 Subject: [PATCH 055/624] thinkpad/intel: drop mkDefault, fixes #33 --- lenovo/thinkpad/intel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/intel.nix b/lenovo/thinkpad/intel.nix index 5b9412477854..32d959487098 100644 --- a/lenovo/thinkpad/intel.nix +++ b/lenovo/thinkpad/intel.nix @@ -1,4 +1,4 @@ { - boot.kernelModules = mkDefault [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-intel" ]; services.xserver.videoDrivers = [ "intel" ]; } From 1133ce7d83825cf14cb95b4ffab64882d830072e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 22 Dec 2017 17:15:09 +0000 Subject: [PATCH 056/624] x220: drop security.rngd.enable = true, it's by default --- lenovo/thinkpad/x220/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index 3a9e99b4b344..44f1175e221a 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -3,9 +3,6 @@ { imports = [ ../intel.nix ]; - # TPM chip countains a RNG - security.rngd.enable = true; - boot = { kernelModules = [ "tp_smapi" ]; extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; From ee47d3147827f7888c9edf75873e52c913e052a0 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 22 Dec 2017 17:15:52 +0000 Subject: [PATCH 057/624] thinkpad: enable tp_smapi on all ThinkPads --- lenovo/thinkpad/common.nix | 5 +++++ lenovo/thinkpad/x220/default.nix | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lenovo/thinkpad/common.nix b/lenovo/thinkpad/common.nix index cb800012c371..e51a5751241b 100644 --- a/lenovo/thinkpad/common.nix +++ b/lenovo/thinkpad/common.nix @@ -5,6 +5,11 @@ let in { + boot = { + kernelModules = [ "tp_smapi" ]; + extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; + }; + hardware.trackpoint.enable = mkDefault true; services.tlp.enable = mkDefault true; services.xserver.libinput.enable = mkDefault true; diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index 44f1175e221a..2a506d0d9b0d 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -3,11 +3,6 @@ { imports = [ ../intel.nix ]; - boot = { - kernelModules = [ "tp_smapi" ]; - extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; - }; - # hard disk protection if the laptop falls services.hdapsd.enable = true; From 1bb559377262403fbe35e05072bd9807a9ce38f7 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 22 Dec 2017 17:53:15 +0000 Subject: [PATCH 058/624] t410: drop i915 warning --- lenovo/thinkpad/t410/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index 53d5515c77c7..581d9012eeab 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -5,7 +5,6 @@ boot = { kernelParams = [ - # Kernel GPU Savings Options (NOTE i915 chipset only) "drm.debug=0" "drm.vblankoffdelay=1" "i915.semaphores=1" @@ -25,7 +24,6 @@ "i915.i915_enable_rc6=1" ]; blacklistedKernelModules = [ - # Kernel GPU Savings Options (NOTE i915 chipset only) "sierra_net" "cdc_mbim" "cdc_ncm" "btusb" ]; }; From 0c17d72838e5994a60ec06e42223a6449ee741b8 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 22 Dec 2017 17:49:09 +0000 Subject: [PATCH 059/624] thinkpad: drop intel.nix, explicit services.xserver.videoDrivers Kernel modules are already generated with nixos-generate-config. --- lenovo/thinkpad/intel.nix | 4 ---- lenovo/thinkpad/t410/default.nix | 3 +-- lenovo/thinkpad/t440p/default.nix | 4 ++-- lenovo/thinkpad/t460s/default.nix | 3 ++- 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 lenovo/thinkpad/intel.nix diff --git a/lenovo/thinkpad/intel.nix b/lenovo/thinkpad/intel.nix deleted file mode 100644 index 32d959487098..000000000000 --- a/lenovo/thinkpad/intel.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - boot.kernelModules = [ "kvm-intel" ]; - services.xserver.videoDrivers = [ "intel" ]; -} diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index 581d9012eeab..6fe10b439846 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -1,8 +1,6 @@ { config, pkgs, ... }: { - imports = [ ../intel.nix ]; - boot = { kernelParams = [ "drm.debug=0" @@ -86,4 +84,5 @@ # ${pkgs.ethtool}/bin/ethtool -s enp0s25 wol d || true }; + services.xserver.videoDrivers = [ "intel" ]; } diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index 5c8699dffbe2..2342f6da237d 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -1,12 +1,12 @@ { config, pkgs, ... }: { - imports = [ ../intel.nix ]; - boot = { extraModprobeConfig = '' options bbswitch use_acpi_to_detect_card_state=1 ''; kernelModules = [ "tpm-rng" ]; }; + + services.xserver.videoDrivers = [ "intel" ]; } diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index 4255dddef72f..aca2b40bcb13 100644 --- a/lenovo/thinkpad/t460s/default.nix +++ b/lenovo/thinkpad/t460s/default.nix @@ -3,7 +3,6 @@ { imports = [ ../lib/kernel-version.nix - ./general-intel.nix ]; # Use the gummiboot efi boot loader. (From default generated configuration.nix) @@ -26,4 +25,6 @@ # Aspect Ratio: 16 × 9 (1.78:1) # Pixel Count: 3,686,400 # Megapixels: 3.69MP + + services.xserver.videoDrivers = [ "intel" ]; } From 67cd7af6be9cc4ece9622e2f6db2f211ff261f0e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 01:13:08 +0000 Subject: [PATCH 060/624] thinkpad: common.nix -> default.nix + fixup after intel.nix drop --- lenovo/thinkpad/{common.nix => default.nix} | 0 lenovo/thinkpad/t410/default.nix | 2 ++ lenovo/thinkpad/t440p/default.nix | 2 ++ lenovo/thinkpad/t460s/default.nix | 1 + lenovo/thinkpad/x140e/default.nix | 2 +- lenovo/thinkpad/x220/default.nix | 4 +++- 6 files changed, 9 insertions(+), 2 deletions(-) rename lenovo/thinkpad/{common.nix => default.nix} (100%) diff --git a/lenovo/thinkpad/common.nix b/lenovo/thinkpad/default.nix similarity index 100% rename from lenovo/thinkpad/common.nix rename to lenovo/thinkpad/default.nix diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index 6fe10b439846..3dbc4e596c33 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -1,6 +1,8 @@ { config, pkgs, ... }: { + imports = [ ../. ]; + boot = { kernelParams = [ "drm.debug=0" diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index 2342f6da237d..262638adba1c 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -1,6 +1,8 @@ { config, pkgs, ... }: { + imports = [ ../. ]; + boot = { extraModprobeConfig = '' options bbswitch use_acpi_to_detect_card_state=1 diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index aca2b40bcb13..3e51709bd2bc 100644 --- a/lenovo/thinkpad/t460s/default.nix +++ b/lenovo/thinkpad/t460s/default.nix @@ -2,6 +2,7 @@ { imports = [ + ../. ../lib/kernel-version.nix ]; diff --git a/lenovo/thinkpad/x140e/default.nix b/lenovo/thinkpad/x140e/default.nix index a6fb02a9e886..38f34608a3df 100644 --- a/lenovo/thinkpad/x140e/default.nix +++ b/lenovo/thinkpad/x140e/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - imports = [ ../common.nix ]; + imports = [ ../. ]; boot = { # wireless diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index 2a506d0d9b0d..81fec0649674 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - imports = [ ../intel.nix ]; + imports = [ ../. ]; # hard disk protection if the laptop falls services.hdapsd.enable = true; @@ -11,4 +11,6 @@ #security.pam.services.login.fprintAuth = true; #security.pam.services.xscreensaver.fprintAuth = true; # similarly for other PAM providers + + services.xserver.videoDrivers = [ "intel" ]; } From fcb9d76ead20fe9ff7cbed64e88672166e48d355 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 01:20:36 +0000 Subject: [PATCH 061/624] thinkpad: use lib.mkDefault on all unmergable options --- lenovo/thinkpad/default.nix | 10 +++------- lenovo/thinkpad/t410/default.nix | 4 ++-- lenovo/thinkpad/t440p/default.nix | 4 ++-- lenovo/thinkpad/t460s/default.nix | 6 +++--- lenovo/thinkpad/x140e/default.nix | 2 +- lenovo/thinkpad/x220/default.nix | 4 ++-- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix index e51a5751241b..aba9596d410e 100644 --- a/lenovo/thinkpad/default.nix +++ b/lenovo/thinkpad/default.nix @@ -1,16 +1,12 @@ { lib, pkgs, ... }: -let - inherit (lib) mkDefault; -in - { boot = { kernelModules = [ "tp_smapi" ]; extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; }; - hardware.trackpoint.enable = mkDefault true; - services.tlp.enable = mkDefault true; - services.xserver.libinput.enable = mkDefault true; + hardware.trackpoint.enable = lib.mkDefault true; + services.tlp.enable = lib.mkDefault true; + services.xserver.libinput.enable = lib.mkDefault true; } diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index 3dbc4e596c33..b7a765dc36a0 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ ../. ]; @@ -28,7 +28,7 @@ ]; }; - hardware.cpu.intel.updateMicrocode = true; + hardware.cpu.intel.updateMicrocode = lib.mkDefault true; systemd.services.tune-powermanagement = { description = "Tune Powermanagement"; diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index 262638adba1c..ddf6bd8ae9d3 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -1,10 +1,10 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ ../. ]; boot = { - extraModprobeConfig = '' + extraModprobeConfig = lib.mkDefault '' options bbswitch use_acpi_to_detect_card_state=1 ''; kernelModules = [ "tpm-rng" ]; diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index 3e51709bd2bc..039b6a47eccd 100644 --- a/lenovo/thinkpad/t460s/default.nix +++ b/lenovo/thinkpad/t460s/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ @@ -7,8 +7,8 @@ ]; # Use the gummiboot efi boot loader. (From default generated configuration.nix) - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader.systemd-boot.enable = lib.mkDefault true; + boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_T460s kernelAtleast = [ diff --git a/lenovo/thinkpad/x140e/default.nix b/lenovo/thinkpad/x140e/default.nix index 38f34608a3df..31b0bb3b72d9 100644 --- a/lenovo/thinkpad/x140e/default.nix +++ b/lenovo/thinkpad/x140e/default.nix @@ -9,7 +9,7 @@ extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; # audio device - extraModprobeConfig = '' + extraModprobeConfig = lib.mkDefault '' options snd_hda_intel enable=0,1 ''; }; diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index 81fec0649674..285d13e58be4 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -1,10 +1,10 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ ../. ]; # hard disk protection if the laptop falls - services.hdapsd.enable = true; + services.hdapsd.enable = lib.mkDefault true; # fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) #services.fprintd.enable = true; From 7810833d2d61319c8b1cf2abe043e1a8645035ce Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 01:22:48 +0000 Subject: [PATCH 062/624] t410: drop POWERTOP-like script in favor of services.tlp.enable tlp does the same thing, but dynamically, depending on whether power adapter is connected. It is also much more portable than this script. Direct replacement would be `powerManagement.powertop.enable`. --- lenovo/thinkpad/t410/default.nix | 56 -------------------------------- 1 file changed, 56 deletions(-) diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index b7a765dc36a0..ec8cbc7f90ab 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -30,61 +30,5 @@ hardware.cpu.intel.updateMicrocode = lib.mkDefault true; - systemd.services.tune-powermanagement = { - description = "Tune Powermanagement"; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - wantedBy = [ "multi-user.target" ]; - unitConfig.RequiresMountsFor = "/sys"; - script = '' - echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs' - echo '1' > '/sys/module/snd_hda_intel/parameters/power_save' - echo 'auto' > '/sys/bus/i2c/devices/i2c-0/device/power/control' - echo 'auto' > '/sys/bus/i2c/devices/i2c-1/device/power/control' - echo 'auto' > '/sys/bus/i2c/devices/i2c-2/device/power/control' - echo 'auto' > '/sys/bus/i2c/devices/i2c-3/device/power/control' - echo 'auto' > '/sys/bus/i2c/devices/i2c-4/device/power/control' - echo 'auto' > '/sys/bus/i2c/devices/i2c-5/device/power/control' - echo 'auto' > '/sys/bus/i2c/devices/i2c-6/device/power/control' - echo 'auto' > '/sys/bus/i2c/devices/i2c-7/device/power/control' - echo 'auto' > '/sys/bus/i2c/devices/i2c-8/device/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:00.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:02.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:16.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:16.3/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:19.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1a.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1b.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.1/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.3/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1c.4/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1d.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1e.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.2/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.3/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:00:1f.6/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:03:00.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:0d:00.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:0d:00.1/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:ff:00.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:ff:00.1/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:ff:02.0/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:ff:02.1/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:ff:02.2/power/control' - echo 'auto' > '/sys/bus/pci/devices/0000:ff:02.3/power/control' - echo 'auto' > '/sys/bus/usb/devices/1-1.3/power/control' - echo 'min_power' > '/sys/class/scsi_host/host0/link_power_management_policy' - echo 'min_power' > '/sys/class/scsi_host/host1/link_power_management_policy' - echo 'min_power' > '/sys/class/scsi_host/host2/link_power_management_policy' - echo 'min_power' > '/sys/class/scsi_host/host3/link_power_management_policy' - echo 'min_power' > '/sys/class/scsi_host/host4/link_power_management_policy' - echo 'min_power' > '/sys/class/scsi_host/host5/link_power_management_policy' - /run/current-system/sw/bin/rmmod e1000e || true - ''; - # ${pkgs.ethtool}/bin/ethtool -s enp0s25 wol d || true - }; - services.xserver.videoDrivers = [ "intel" ]; } From 0c51ed4b80179d07c1ab1c8f18a5267677b24f2e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 01:28:22 +0000 Subject: [PATCH 063/624] x140e: drop options generated with nixos-generate-config --- lenovo/thinkpad/x140e/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/lenovo/thinkpad/x140e/default.nix b/lenovo/thinkpad/x140e/default.nix index 31b0bb3b72d9..81f67addcd85 100644 --- a/lenovo/thinkpad/x140e/default.nix +++ b/lenovo/thinkpad/x140e/default.nix @@ -3,17 +3,9 @@ { imports = [ ../. ]; - boot = { - # wireless - kernelModules = [ "kvm-amd" "wl" ]; - extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; + boot.extraModprobeConfig = lib.mkDefault '' + options snd_hda_intel enable=0,1 + ''; - # audio device - extraModprobeConfig = lib.mkDefault '' - options snd_hda_intel enable=0,1 - ''; - }; - - # video card services.xserver.videoDrivers = [ "ati" ]; } From 1b81e4e476343aafa85753ce6c5c061203c713d6 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 02:34:44 +0000 Subject: [PATCH 064/624] asus/wireless-ac1300: use config.boot.kernelPackages --- asus/wireless-ac1300.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asus/wireless-ac1300.nix b/asus/wireless-ac1300.nix index a3122a78a46e..39aa1c7f89da 100644 --- a/asus/wireless-ac1300.nix +++ b/asus/wireless-ac1300.nix @@ -3,6 +3,6 @@ { pkgs, ... }: { - boot.extraModulePackages = [ pkgs.linuxPackages.rtl8812au ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8812au ]; boot.kernelModules = [ "8812au" ]; } From 9609c900f9d57668a56b978b9a8e6e965ca558ca Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 03:38:17 +0000 Subject: [PATCH 065/624] apple: add services.mbpfan.enable --- apple/default.nix | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 apple/default.nix diff --git a/apple/default.nix b/apple/default.nix new file mode 100644 index 000000000000..6fa8e5de705f --- /dev/null +++ b/apple/default.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + services.mbpfan.enable = lib.mkDefault true; +} From e4639aa028bdf16cea8785420ef7878ac3c98f1d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 11:10:07 +0000 Subject: [PATCH 066/624] thinkpad: add missing `config` --- lenovo/thinkpad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix index aba9596d410e..03d9dff02e30 100644 --- a/lenovo/thinkpad/default.nix +++ b/lenovo/thinkpad/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: { boot = { From 2951a4f4b0b33ae266d0cd98f693023c6ed99577 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 11:17:39 +0000 Subject: [PATCH 067/624] thinkpad: move fprintd comment from X220 to parent profile --- lenovo/thinkpad/default.nix | 3 +++ lenovo/thinkpad/x220/default.nix | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix index 03d9dff02e30..9b82b8b2c9f2 100644 --- a/lenovo/thinkpad/default.nix +++ b/lenovo/thinkpad/default.nix @@ -9,4 +9,7 @@ hardware.trackpoint.enable = lib.mkDefault true; services.tlp.enable = lib.mkDefault true; services.xserver.libinput.enable = lib.mkDefault true; + + # Fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) + # services.fprintd.enable = true; } diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index 285d13e58be4..d3e723dc4614 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -5,12 +5,5 @@ # hard disk protection if the laptop falls services.hdapsd.enable = lib.mkDefault true; - - # fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) - #services.fprintd.enable = true; - #security.pam.services.login.fprintAuth = true; - #security.pam.services.xscreensaver.fprintAuth = true; - # similarly for other PAM providers - services.xserver.videoDrivers = [ "intel" ]; } From fc9b7ae0024066130c9cc3b699e8b103e7c21d62 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 11:44:48 +0000 Subject: [PATCH 068/624] tests: add evaluation/build test --- tests/build-test.nix | 10 ++++++++++ tests/build-test.sh | 8 ++++++++ 2 files changed, 18 insertions(+) create mode 100644 tests/build-test.nix create mode 100755 tests/build-test.sh diff --git a/tests/build-test.nix b/tests/build-test.nix new file mode 100644 index 000000000000..936259f3ee99 --- /dev/null +++ b/tests/build-test.nix @@ -0,0 +1,10 @@ +{ + imports = [ ]; + + boot.loader.systemd-boot.enable = true; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; + fsType = "btrfs"; + }; +} diff --git a/tests/build-test.sh b/tests/build-test.sh new file mode 100755 index 000000000000..bd762a5d74d4 --- /dev/null +++ b/tests/build-test.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +cd $(dirname $0) + +for profile in $(find .. -name \*.nix); do + echo $profile >&2 + nixos-rebuild -I nixos-config=build-test.nix -I nixos-hardware-profile=$profile dry-build +done From 097d47e3f80f3a24462669a05696065128773bdb Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 11:50:06 +0000 Subject: [PATCH 069/624] c720: drop kernel notes for unsupported kernel versions --- acer/c720/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/acer/c720/default.nix b/acer/c720/default.nix index 483608925d6a..0967ef424bce 100644 --- a/acer/c720/default.nix +++ b/acer/c720/default.nix @@ -1,10 +1 @@ -{ lib, ... }: -with lib; -{ - imports = singleton ../lib/kernerl-version.nix; - - kernelAtleast = singleton - { version = "3.18"; - msg = "Cypress APA touchpad supported added in Linux-3.17-rc1"; - }; -} +{} From 667b1d8eb9c23d1de433d71caea5648a5acabadb Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 11:59:21 +0000 Subject: [PATCH 070/624] 4810t: fix evaluation, clean up --- acer/aspire/4810t/default.nix | 48 ++++++++++++++--------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/acer/aspire/4810t/default.nix b/acer/aspire/4810t/default.nix index ce1091bd87b7..b984623347da 100644 --- a/acer/aspire/4810t/default.nix +++ b/acer/aspire/4810t/default.nix @@ -1,37 +1,27 @@ -/* imported from https://nixos.org/wiki/Acer_4810T */ - -{ config, pkgs, lib, ... }: - { - # Make te network WLAN card (wlan0) firmware available - require = [ /nixos/modules/hardware/network/intel-5000.nix ]; - - boot = rec { - initrd.kernelModules = [ "ata_piix" ]; - kernelParams = [ + boot = { + initrd.kernelModules = [ "ata_piix" ]; + kernelParams = [ "apm=on" "acpi=on" - "vga=0x317" + "vga=0x317" "video=vesafb:ywrap" # Important, to disable Kernel Mode Setting for the graphics card # This will allow backlight regulation "nomodeset" - ]; - kernelModules = [ - "kvm-intel" - ]; - }; - - services = { - xserver = { - enable = true; - defaultDepth = 24; - videoDriver = "intel"; - autorun = true; - driSupport = false; - synaptics = { - enable = true; - dev = "/dev/input/event8"; - }; + ]; }; -}; + + hardware.opengl.driSupport = false; + + services.xserver = { + enable = true; + defaultDepth = 24; + videoDriver = "intel"; + autorun = true; + synaptics = { + enable = true; + dev = "/dev/input/event8"; + }; + }; +} From dd87817ffc7c60929949183cdf9dc88c96e4bdb6 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 12:04:23 +0000 Subject: [PATCH 071/624] airis/n990: fix evaluation --- airis/n990/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/airis/n990/default.nix b/airis/n990/default.nix index b3056b7d0b4d..7c45d2a2b3dc 100644 --- a/airis/n990/default.nix +++ b/airis/n990/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, pkgs, ... }: { boot = { @@ -13,10 +13,10 @@ ]; }; - services.xserver = { - videoDriver = "unichrome"; - synaptics.enable = true; - }; + hardware.firmware = with pkgs; [ intel2200BGFirmware ]; - networking.enableIntel2200BGFirmware = true; + services.xserver = { + synaptics.enable = lib.mkDefault true; + videoDrivers = [ "unichrome" ]; + }; } From a8b7b6ffe5813545e289404e504a21e2222f7ab5 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 12:13:25 +0000 Subject: [PATCH 072/624] apple/macbook-pro/10-1: fix evaluation, drop old kernel notes --- apple/macbook-pro/10-1/default.nix | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix index 797404eddcf8..85921b47ba36 100644 --- a/apple/macbook-pro/10-1/default.nix +++ b/apple/macbook-pro/10-1/default.nix @@ -1,27 +1,16 @@ -{ config, pkgs, ... }: +{ lib, pkgs, ... }: { - imports = - [ ../lib/kernel-version.nix - ]; + imports = [ ../. ]; - # Use the systemd-boot efi boot loader. (From default generated configuration.nix) boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # I use this but not sure whether its needed. - # Right click does *NOT* work - services.xserver.libinput.enable = true; - - kernelAtleast = - [ { version = "4.7"; msg = "Broadcom WiFi confirmed not to work."; } - ]; - - # Couldn't get X to work with nvidia - # Also, PTYs don't work after X/nvidia starts - services.xserver.videoDrivers = [ "nvidia" ]; hardware.opengl.driSupport32Bit = true; - # Seems to improve battery life *and* keep the CPU cooler - services.mbpfan.enable = true; + services.xserver = { + libinput.enable = lib.mkDefault true; + # TODO: we should not enable unfree drivers + videoDrivers = [ "nvidia" ]; + }; } From cbe052c49e80ccb27d2573e9dc9e7bbc6df4a0a4 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 12:16:10 +0000 Subject: [PATCH 073/624] apple/macbook-pro/12-1: clean up --- apple/macbook-pro/12-1/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/apple/macbook-pro/12-1/default.nix b/apple/macbook-pro/12-1/default.nix index c755ce00e7cc..78a7d6faf824 100644 --- a/apple/macbook-pro/12-1/default.nix +++ b/apple/macbook-pro/12-1/default.nix @@ -1,17 +1,12 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: + { - imports = - [ - - ]; + imports = [ + + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - # The USB subsystem wakes up the MBP directly after suspend if - # we don't disable it. - services.udev.extraRules = '' + # USB subsystem wakes up MBP right after suspend unless we disable it. + services.udev.extraRules = lib.mkDefault '' SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled" ''; } From 63b3836fcf0ff03b5f96b173f5c06710f08b2c3e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 12:17:37 +0000 Subject: [PATCH 074/624] apple: use global apple profile (for mbpfan) --- apple/macbook-pro/10-1/default.nix | 2 +- apple/macbook-pro/12-1/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix index 85921b47ba36..c2fa79f571c3 100644 --- a/apple/macbook-pro/10-1/default.nix +++ b/apple/macbook-pro/10-1/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: { - imports = [ ../. ]; + imports = [ ../../. ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/apple/macbook-pro/12-1/default.nix b/apple/macbook-pro/12-1/default.nix index 78a7d6faf824..63c36db6472a 100644 --- a/apple/macbook-pro/12-1/default.nix +++ b/apple/macbook-pro/12-1/default.nix @@ -2,6 +2,7 @@ { imports = [ + ../../. ]; From 0344137b57a5429a8ac49557be38a806ed30ba3b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 12:30:41 +0000 Subject: [PATCH 075/624] dell/xps/15-9550: fix evaluation, drop old kernel notes --- dell/xps/15-9550/default.nix | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dell/xps/15-9550/default.nix b/dell/xps/15-9550/default.nix index 04f717422585..e0bb70058abd 100644 --- a/dell/xps/15-9550/default.nix +++ b/dell/xps/15-9550/default.nix @@ -1,25 +1,11 @@ -{ config, pkgs, ... }: +{ lib, ... }: { - imports = - [ ../lib/kernel-version.nix - ]; + boot.loader.systemd-boot.enable = lib.mkDefault true; + boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; - # Use the systemd-boot efi boot loader. (From default generated configuration.nix) - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # Honestly forget if needed or just better for touchpad. - # Synaptics also works, but doesn't have working palm and thumb detection. - services.xserver.libinput.enable = true; - - # Intel Graphics confirmed not working at 4.1, confirmed working at {4.3, 4.4} - kernelAtleast = - [ { version = "4.2"; msg = "Intel Graphics confirmed not to work."; } - { version = "4.3"; msg = "Intel Graphics untested."; } - { version = "4.4"; msg = "Touchpad does not work, though the touchscreen still does"; } - ]; - - # To just use intel integrated graphics with Intel's open source driver + # To just use Intel integrated graphics with Intel's open source driver # hardware.nvidiaOptimus.disable = true; + + services.xserver.libinput.enable = lib.mkDefault true; } From f62ead1ce0874c3773fb8d762e5de3b336e8c4ac Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 12:34:24 +0000 Subject: [PATCH 076/624] samsung/np900x3c: fix evaluation, drop old kernel notes --- samsung/np900x3c/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/samsung/np900x3c/default.nix b/samsung/np900x3c/default.nix index 73d16bd62151..8f19af573037 100644 --- a/samsung/np900x3c/default.nix +++ b/samsung/np900x3c/default.nix @@ -1,13 +1,5 @@ { lib, ... }: -with lib; + { - imports = [ ../lib/kernel-version.nix ]; - - services.xserver.synaptics.enable = true; - - kernelAtleast = singleton - { version = "3.9"; - msg = "Runtime system freezes can be expected on Linux kernels prior to 3.9, probably because of bugs in intel video drivers."; - }; - -} \ No newline at end of file + services.xserver.synaptics.enable = lib.mkDefault true; +} From 95c8873c41ef57d820b027e16db0709c050579e1 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 12:35:46 +0000 Subject: [PATCH 077/624] supermicro/a1sri-2758f: fix evaluation, drop old kernel notes --- supermicro/a1sri-2758f/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/supermicro/a1sri-2758f/default.nix b/supermicro/a1sri-2758f/default.nix index c16c093936e2..3ffdc0c6e6d2 100644 --- a/supermicro/a1sri-2758f/default.nix +++ b/supermicro/a1sri-2758f/default.nix @@ -1,20 +1,9 @@ # http://www.supermicro.com/products/motherboard/Atom/X10/A1SRi-2758F.cfm -# # This board contains a TPM header, but you must supply your own module. -# -{ pkgs, lib, ... }: +{ pkgs, ... }: { - imports = [ ../lib/kernel-version.nix ]; - - environment.systemPackages = [ pkgs.ipmitool ]; boot.kernelModules = [ "ipmi_devintf" "ipmi_si" ]; - - kernelAtleast = lib.singleton - { version = "4.4"; - msg = - "ethernet driver may be buggy on older kernels, "+ - ''try 'networking.dhcpcd.extraConfig = "nolink";' if you encounter loss of link problems''; - }; + environment.systemPackages = [ pkgs.ipmitool ]; } From 721741b0c79b190259e415ea1606ced6744ee199 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 12:37:08 +0000 Subject: [PATCH 078/624] lenovo/thinkpad/t460s: fix evaluation, drop old kernel notes --- lenovo/thinkpad/t460s/default.nix | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index 039b6a47eccd..ffe6ec33c00c 100644 --- a/lenovo/thinkpad/t460s/default.nix +++ b/lenovo/thinkpad/t460s/default.nix @@ -1,31 +1,11 @@ { config, lib, pkgs, ... }: { - imports = [ - ../. - ../lib/kernel-version.nix - ]; + imports = [ ../. ]; # Use the gummiboot efi boot loader. (From default generated configuration.nix) boot.loader.systemd-boot.enable = lib.mkDefault true; boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; - # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_T460s - kernelAtleast = [ - { version = "4.5.1"; msg = "The physical mouse buttons works incorrectly."; } - { version = "4.6"; msg = "Suspending the T460s by closing the lid when running on battery causes the machine to freeze up entirely."; } - ]; - - # For the screen. I don't know what to do with this information, but - # the hiDPI support is far from perfect (as of July 2016): - - # Resolution: 2560 x 1440 px - # Size: 12.2" × 6.86" (30.99cm × 17.43cm) - # DPI: 209.8 - # Dot Pitch: 0.1211mm - # Aspect Ratio: 16 × 9 (1.78:1) - # Pixel Count: 3,686,400 - # Megapixels: 3.69MP - services.xserver.videoDrivers = [ "intel" ]; } From bf86fda74c243c435f7fc3bfd755252c0780e68f Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 13:10:02 +0000 Subject: [PATCH 079/624] tests/build-test: allowBroken, allowUnfree allowUnfree is set to true for evaluation purposes only. --- tests/build-test.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/build-test.nix b/tests/build-test.nix index 936259f3ee99..e946b0bbef50 100644 --- a/tests/build-test.nix +++ b/tests/build-test.nix @@ -7,4 +7,9 @@ device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; fsType = "btrfs"; }; + + nixpkgs.config = { + allowBroken = true; + allowUnfree = true; + }; } From e1806b4c1bd647c181993ab332c8e47b47b66cce Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 16:11:44 +0300 Subject: [PATCH 080/624] lib: drop, fixes #16 (#37) Hardware notes are seemingly less useful than a README, and kernelAtLeast option, while potentially useful: a) is not used anywhere in the tree at the moment, b) doesn't properly work when there are multiple elements in the list, c) assumes that there are no degradations ever. --- lib/hardware-notes.nix | 45 ------------------------------------------ lib/kernel-version.nix | 31 ----------------------------- 2 files changed, 76 deletions(-) delete mode 100644 lib/hardware-notes.nix delete mode 100644 lib/kernel-version.nix diff --git a/lib/hardware-notes.nix b/lib/hardware-notes.nix deleted file mode 100644 index 4414ea3914e0..000000000000 --- a/lib/hardware-notes.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - # use tail recursion to prevent whitespace padding - mkLog = list: - let - head = builtins.head list; - tail = builtins.tail list; - in - '' - # ${head.title} - ${head.text}${if tail == [] then "" else "\n\n${mkLog tail}"} - ''; -in - -{ - - options = { - hardwareNotes = mkOption { - internal = true; - type = types.listOf types.optionSet; - options = { - title = mkOption { - type = types.str; - example = "Thunkpad-2000: increase self-destruct timeout"; - }; - text = mkOption { - type = types.str; - example = - '' - Increase security timeout at boot using platform managment - tool to prevent premature data loss. - ''; - }; - }; - }; - }; - - config = { - environment.etc."hardware-notes".text = mkLog config.hardwareNotes; - }; - -} diff --git a/lib/kernel-version.nix b/lib/kernel-version.nix deleted file mode 100644 index 99115a7f75e3..000000000000 --- a/lib/kernel-version.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, ... }: -with lib; -let - cfg = config; -in -{ - options.kernelAtleast = mkOption { - type = types.listOf types.optionSet; - options = - [ { version = mkOption { - type = types.str; - example = "4.4"; - description = - "Issue warning when kernel version is below this number."; - }; - msg = mkOption { - type = types.str; - example = ""; - }; - } - ]; - }; - - config.warnings = builtins.concatLists (map - (x: if (builtins.compareVersions cfg.boot.kernelPackages.kernel.version x.version) == -1 - then [ "${x.msg} (${cfg.boot.kernelPackages.kernel.version} < ${x.version})" ] - else [ ] - ) cfg.kernelAtleast - ); - -} From b8afb99c1613987e93fe8f54548631f524187baa Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 13:26:11 +0000 Subject: [PATCH 081/624] README: drop inversepath/usbarmory from the table --- README.org | 1 - 1 file changed, 1 deletion(-) diff --git a/README.org b/README.org index 97df02cd3171..a8d551ac19cf 100644 --- a/README.org +++ b/README.org @@ -16,7 +16,6 @@ Then add an appropriate profile path to ~imports~ in | Apple MacBook Pro 10,1 | ~~ | | Apple MacBook Pro 12,1 | ~~ | | Dell XPS 15 9550 | ~~ | -| Inverse Path USB armory | ~~ | | Lenovo IdeaPad Z510 | ~~ | | Lenovo ThinkPad T410 | ~~ | | Lenovo ThinkPad T440p | ~~ | From f6526819a03d99854dfed3bddeb28176c81a5859 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 13:29:41 +0000 Subject: [PATCH 082/624] tests/build-test: rename to eval-test --- tests/{build-test.nix => eval-test.nix} | 0 tests/{build-test.sh => eval-test.sh} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/{build-test.nix => eval-test.nix} (100%) rename tests/{build-test.sh => eval-test.sh} (51%) diff --git a/tests/build-test.nix b/tests/eval-test.nix similarity index 100% rename from tests/build-test.nix rename to tests/eval-test.nix diff --git a/tests/build-test.sh b/tests/eval-test.sh similarity index 51% rename from tests/build-test.sh rename to tests/eval-test.sh index bd762a5d74d4..d3eb3a1594be 100755 --- a/tests/build-test.sh +++ b/tests/eval-test.sh @@ -4,5 +4,5 @@ cd $(dirname $0) for profile in $(find .. -name \*.nix); do echo $profile >&2 - nixos-rebuild -I nixos-config=build-test.nix -I nixos-hardware-profile=$profile dry-build + nixos-rebuild -I nixos-config=eval-test.nix -I nixos-hardware-profile=$profile dry-build done From a95291d21d589156580f8bfdbed6190756a8f3ca Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 13:34:49 +0000 Subject: [PATCH 083/624] asus/wireless-ac1300: fix evaluation --- asus/wireless-ac1300.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/asus/wireless-ac1300.nix b/asus/wireless-ac1300.nix index 39aa1c7f89da..6e9b815a0eb0 100644 --- a/asus/wireless-ac1300.nix +++ b/asus/wireless-ac1300.nix @@ -1,6 +1,4 @@ -# Use this module if you use a realtek 18812au based wifi dongle, like ASUS Wireless-AC1300 - -{ pkgs, ... }: +{ config, ... }: { boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8812au ]; From f35389f4690e297c8f3cc0229f213aaaecc882b1 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 13:57:47 +0000 Subject: [PATCH 084/624] tests/eval-test: exit on failed evaluation, skip some paths --- tests/eval-test.sh | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/tests/eval-test.sh b/tests/eval-test.sh index d3eb3a1594be..72d634199d88 100755 --- a/tests/eval-test.sh +++ b/tests/eval-test.sh @@ -1,8 +1,27 @@ #!/bin/sh -cd $(dirname $0) +cd $(dirname $0)/.. -for profile in $(find .. -name \*.nix); do - echo $profile >&2 - nixos-rebuild -I nixos-config=eval-test.nix -I nixos-hardware-profile=$profile dry-build +skip_paths=( + ./inversepath/usbarmory/* + ./tests/* +) + +find=(find . -name *.nix) + +for path in ${skip_paths[@]}; do + find+=(-not -path $path) +done + +for profile in `${find[@]}`; do + echo evaluating $profile >&2 + + nixos-rebuild \ + -I nixos-config=tests/eval-test.nix \ + -I nixos-hardware-profile=$profile \ + dry-build + + if [ $? -ne 0 ]; then + exit 1 + fi done From 4570276556eb917caa75be07004ded895ea06041 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 14:12:06 +0000 Subject: [PATCH 085/624] inversepath/usbarmory: drop inappropriate comment --- inversepath/usbarmory/host.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inversepath/usbarmory/host.nix b/inversepath/usbarmory/host.nix index eff7947075fb..87d4d954d303 100644 --- a/inversepath/usbarmory/host.nix +++ b/inversepath/usbarmory/host.nix @@ -24,12 +24,11 @@ in services.udev.extraRules = ''SUBSYSTEM=="net", ACTION=="add", ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a2", NAME="${staticDevName}"''; - # systemshit will probably still leave an a interface with a garbage name around networking = { interfaces."${staticDevName}".ip4 = [{ address = "10.0.0.2"; prefixLength = 24; }]; nat = { enable = true; internalInterfaces = [ staticDevName ]; }; extraHosts = "10.0.0.1 armory"; }; - + } From f31e4afea549646a5085aec95796a9f04036c3e1 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 14:19:38 +0000 Subject: [PATCH 086/624] apple/macbook-pro/10-1: elaborate more on NVidia driver --- apple/macbook-pro/10-1/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix index c2fa79f571c3..0fa8a2f4bc2e 100644 --- a/apple/macbook-pro/10-1/default.nix +++ b/apple/macbook-pro/10-1/default.nix @@ -10,7 +10,9 @@ services.xserver = { libinput.enable = lib.mkDefault true; + # TODO: we should not enable unfree drivers + # when there is an alternative (i.e. nouveau) videoDrivers = [ "nvidia" ]; }; } From a74c9bdaf8ca2b1e5496db4fbd5780e84b5f4db0 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 14:57:53 +0000 Subject: [PATCH 087/624] acer/c720: drop empty profile --- README.org | 1 - acer/c720/README.wiki | 23 ----------------------- acer/c720/default.nix | 1 - 3 files changed, 25 deletions(-) delete mode 100644 acer/c720/README.wiki delete mode 100644 acer/c720/default.nix diff --git a/README.org b/README.org index a8d551ac19cf..8f8c0eea5e84 100644 --- a/README.org +++ b/README.org @@ -11,7 +11,6 @@ Then add an appropriate profile path to ~imports~ in | Model | Path | |---------------------------+--------------------------------------------| | Acer Aspire 4810T | ~~ | -| Acer C720 | ~~ | | Airis N990 | ~~ | | Apple MacBook Pro 10,1 | ~~ | | Apple MacBook Pro 12,1 | ~~ | diff --git a/acer/c720/README.wiki b/acer/c720/README.wiki deleted file mode 100644 index 5200ab69c6c7..000000000000 --- a/acer/c720/README.wiki +++ /dev/null @@ -1,23 +0,0 @@ -= Overview = -* Processor: Intel Celeron 2955U @ 1.40GHz -* Network controller: Qualcomm Atheros AR9462 - -= Configuration = -The C720 comes with a Cypress APA touchpad. Support for this touchpad was added in kernel 3.17-rc1. -In order to get the touchpad working CONFIG_CHROME_PLATFORMS needs to be enabled. - -For example, for touchpad support with the 3.18 kernel, the following should be added to /etc/nixos/configuration.nix: - - boot.kernelPackages = pkgs.linuxPackages_3_18; - nixpkgs.config.packageOverrides = pkgs: - { linux_3_18 = pkgs.linux_3_18.override { - extraConfig = - ''''''' - CHROME_PLATFORMS y - '''''''; - }; - }; - -[[Category:Installation]] -[[Category:Hardware]] -[[Category:Laptops]] diff --git a/acer/c720/default.nix b/acer/c720/default.nix deleted file mode 100644 index 0967ef424bce..000000000000 --- a/acer/c720/default.nix +++ /dev/null @@ -1 +0,0 @@ -{} From 3743ae21f52ce986c3a091f29eff13749a3a342f Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 15:13:25 +0000 Subject: [PATCH 088/624] treewide: only ever set unmergable options via lib.mkDefault Also extract documentation from raspberry-pi/2/ profile. --- acer/aspire/4810t/default.nix | 12 +++-- lenovo/ideapad/z510/default.nix | 7 ++- microsoft/surface-pro/3/default.nix | 4 +- raspberry-pi/2/README.txt | 19 +++++++ raspberry-pi/2/default.nix | 84 +++++++++-------------------- supermicro/x10sll-f/default.nix | 4 +- 6 files changed, 58 insertions(+), 72 deletions(-) create mode 100644 raspberry-pi/2/README.txt diff --git a/acer/aspire/4810t/default.nix b/acer/aspire/4810t/default.nix index b984623347da..ed0e923a85c4 100644 --- a/acer/aspire/4810t/default.nix +++ b/acer/aspire/4810t/default.nix @@ -1,3 +1,5 @@ +{ lib, ... }: + { boot = { initrd.kernelModules = [ "ata_piix" ]; @@ -15,12 +17,12 @@ hardware.opengl.driSupport = false; services.xserver = { - enable = true; - defaultDepth = 24; - videoDriver = "intel"; - autorun = true; + enable = lib.mkDefault true; + defaultDepth = lib.mkDefault 24; + videoDrivers = [ "intel" ]; + autorun = lib.mkDefault true; synaptics = { - enable = true; + enable = lib.mkDefault true; dev = "/dev/input/event8"; }; }; diff --git a/lenovo/ideapad/z510/default.nix b/lenovo/ideapad/z510/default.nix index 6cc6dc6c17c1..4c8edf38f215 100644 --- a/lenovo/ideapad/z510/default.nix +++ b/lenovo/ideapad/z510/default.nix @@ -1,9 +1,8 @@ -{ config, pkgs, ... }: +{ lib, ... }: { - hardware.cpu.intel.updateMicrocode = true; + hardware.cpu.intel.updateMicrocode = lib.mkDefault true; - # see https://github.com/NixOS/nixpkgs/issues/18356 - # found buggy driver with method https://wiki.ubuntu.com/DebuggingKernelSuspend + # https://github.com/NixOS/nixpkgs/issues/18356 boot.blacklistedKernelModules = [ "nouveau" ]; } diff --git a/microsoft/surface-pro/3/default.nix b/microsoft/surface-pro/3/default.nix index 48528f90c5c5..70442e654e9f 100644 --- a/microsoft/surface-pro/3/default.nix +++ b/microsoft/surface-pro/3/default.nix @@ -1,8 +1,8 @@ -{ ... }: +{ lib, ... }: { # to use the type cover in the initrd boot.kernelModules = [ "hid-microsoft" ]; - networking.wireless.enable = true; + networking.wireless.enable = lib.mkDefault true; } diff --git a/raspberry-pi/2/README.txt b/raspberry-pi/2/README.txt new file mode 100644 index 000000000000..49f661fae7af --- /dev/null +++ b/raspberry-pi/2/README.txt @@ -0,0 +1,19 @@ +imported from https://nixos.org/wiki/Raspberry_Pi_2 ** + +# Status +The code in master as of June 2015 should be able to prepare a bootable NixOS for Raspberry PI 2. + +There are still some drawbacks: + +NixOS does not provide a /boot/config.txt (the FAT32 partition). +Making NixOS work in the Raspberry PI 2 is mainly the result of the recent work of ambro718, Dezgeg and viric (#nixos@irc.freenode.net). + +# Download +If you want to test, you can flash this 4GB SD image (DOS partition table + fat32 + ext4 rootfs): +magnet:?xt=urn:btih:0def3f6acb3bceddb22cb24098f58e40e2853ec2&dn=rpi2-nixos-4b09501f2-img.xz&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80 + +Then you should be able to nixos-rebuild any configuration.nix changes. + +The image is the result of a "nixos-install" alone. No root password has been set, and it does not include a nixpkgs checkout or channel. + +In fact I (viric) created the FS into a NBD, not a real SD, to create this image. diff --git a/raspberry-pi/2/default.nix b/raspberry-pi/2/default.nix index 897871eb76e2..bc9ca2ab0c23 100644 --- a/raspberry-pi/2/default.nix +++ b/raspberry-pi/2/default.nix @@ -1,64 +1,32 @@ -/** imported from https://nixos.org/wiki/Raspberry_Pi_2 ** - -# Status -The code in master as of June 2015 should be able to prepare a bootable NixOS for Raspberry PI 2. - -There are still some drawbacks: - -NixOS does not provide a /boot/config.txt (the FAT32 partition). -Making NixOS work in the Raspberry PI 2 is mainly the result of the recent work of ambro718, Dezgeg and viric (#nixos@irc.freenode.net). - -# Download -If you want to test, you can flash this 4GB SD image (DOS partition table + fat32 + ext4 rootfs): -magnet:?xt=urn:btih:0def3f6acb3bceddb22cb24098f58e40e2853ec2&dn=rpi2-nixos-4b09501f2-img.xz&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80 - -Then you should be able to nixos-rebuild any configuration.nix changes. - -The image is the result of a "nixos-install" alone. No root password has been set, and it does not include a nixpkgs checkout or channel. - -In fact I (viric) created the FS into a NBD, not a real SD, to create this image. - -*/ - -{ pkgs, config, lib, ...}: +{ lib, pkgs, ...}: { - boot.consoleLogLevel = 7; - boot.loader.grub.enable = false; - boot.loader.generationsDir.enable = false; - boot.loader.raspberryPi.enable = true; - boot.loader.raspberryPi.version = 2; - boot.extraTTYs = [ "ttyAMA0" ]; - boot.kernelPackages = pkgs.linuxPackages_rpi; - boot.kernelParams = [ - #"coherent_pool=6M" - #"smsc95xx.turbo_mode=N" - "dwc_otg.lpm_enable=0" - "console=ttyAMA0,115200" - "rootwait" - #"console=tty1" - "elevator=deadline" - ]; - - # cpufrequtils doesn't build on ARM - powerManagement.enable = false; - - services.xserver.enable = false; - services.openssh.enable = true; - - services.nixosManual.enable = false; - - nixpkgs.config = { - # Since https://github.com/NixOS/nixpkgs/commit/f0b634c7e838cdd65ac6f73933c99af3f38d0fa8 - nixpkgs.config.platform = lib.systems.platforms.raspberrypi2; - # Earlier than that, use this: - # platform = pkgs.platforms.raspberrypi2; - # Also be aware of this issue if you're encountering infinite recursion: - # https://github.com/NixOS/nixpkgs/issues/24170 - - allowUnfree = true; + boot = { + consoleLogLevel = lib.mkDefault 7; + extraTTYs = [ "ttyAMA0" ]; + kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi; + kernelParams = [ + "dwc_otg.lpm_enable=0" + "console=ttyAMA0,115200" + "rootwait" + "elevator=deadline" + ]; + loader = { + grub.enable = lib.mkDefault false; + generationsDir.enable = lib.mkDefault false; + raspberryPi = { + enable = lib.mkDefault true; + version = lib.mkDefault 2; + }; + }; }; nix.buildCores = 4; - nix.binaryCaches = [ ]; + + nixpkgs.config.platform = lib.systems.platforms.raspberrypi2; + + # cpufrequtils doesn't build on ARM + powerManagement.enable = lib.mkDefault false; + + services.openssh.enable = lib.mkDefault true; } diff --git a/supermicro/x10sll-f/default.nix b/supermicro/x10sll-f/default.nix index f60e6cf6fa0e..10c6cc016035 100644 --- a/supermicro/x10sll-f/default.nix +++ b/supermicro/x10sll-f/default.nix @@ -1,9 +1,7 @@ { config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - ipmitool - ]; + environment.systemPackages = with pkgs; [ ipmitool ]; boot.kernelModules = [ "jc42" "ipmi_devintf" "ipmi_si" "tpm_rng" ]; From 08e080ae11656ce0e2d6422ac19285e82b5f70a1 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 15:26:31 +0000 Subject: [PATCH 089/624] thinkpad: only enable tp_smapi on compatible ThinkPads, closes #36 --- lenovo/thinkpad/default.nix | 7 +------ lenovo/thinkpad/t410/default.nix | 2 +- lenovo/thinkpad/tp-smapi.nix | 11 +++++++++++ lenovo/thinkpad/x220/default.nix | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 lenovo/thinkpad/tp-smapi.nix diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix index 9b82b8b2c9f2..ae9804b67181 100644 --- a/lenovo/thinkpad/default.nix +++ b/lenovo/thinkpad/default.nix @@ -1,11 +1,6 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: { - boot = { - kernelModules = [ "tp_smapi" ]; - extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; - }; - hardware.trackpoint.enable = lib.mkDefault true; services.tlp.enable = lib.mkDefault true; services.xserver.libinput.enable = lib.mkDefault true; diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index ec8cbc7f90ab..568d9e65c573 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - imports = [ ../. ]; + imports = [ ../. ../tp-smapi.nix ]; boot = { kernelParams = [ diff --git a/lenovo/thinkpad/tp-smapi.nix b/lenovo/thinkpad/tp-smapi.nix new file mode 100644 index 000000000000..451dd28ece03 --- /dev/null +++ b/lenovo/thinkpad/tp-smapi.nix @@ -0,0 +1,11 @@ +# tp_smapi works on ThinkPads made before 2013. See compat table: +# https://www.thinkwiki.org/wiki/Tp_smapi#Model-specific_status + +{ config, ... }: + +{ + boot = { + kernelModules = [ "tp_smapi" ]; + extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; + }; +} diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index d3e723dc4614..efa67fc6a821 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - imports = [ ../. ]; + imports = [ ../. ../tp-smapi.nix ]; # hard disk protection if the laptop falls services.hdapsd.enable = lib.mkDefault true; From a433fd730f65e427513883865e0610c0a4c519c6 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 17:21:43 +0000 Subject: [PATCH 090/624] inversepath/usbarmory: fix evaluation --- inversepath/usbarmory/README.txt | 6 + inversepath/usbarmory/customKernel.config | 3195 ----------------- inversepath/usbarmory/default.nix | 89 +- inversepath/usbarmory/host.nix | 43 +- inversepath/usbarmory/kernel.config | 995 +++++ inversepath/usbarmory/kernel.nix | 20 + ...sbarmory_dts.patch => usbarmory-dts.patch} | 0 tests/eval-test.sh | 11 +- 8 files changed, 1073 insertions(+), 3286 deletions(-) create mode 100644 inversepath/usbarmory/README.txt delete mode 100644 inversepath/usbarmory/customKernel.config create mode 100644 inversepath/usbarmory/kernel.config create mode 100644 inversepath/usbarmory/kernel.nix rename inversepath/usbarmory/{usbarmory_dts.patch => usbarmory-dts.patch} (100%) diff --git a/inversepath/usbarmory/README.txt b/inversepath/usbarmory/README.txt new file mode 100644 index 000000000000..31922a8d7519 --- /dev/null +++ b/inversepath/usbarmory/README.txt @@ -0,0 +1,6 @@ +USB Armory network interface support + +- rename the Armory USB network interface +- set Armory inteface ip to 10.0.0.2/24 +- enable NAT and forward Armory interface +- add the name 'armory' to /etc/hosts diff --git a/inversepath/usbarmory/customKernel.config b/inversepath/usbarmory/customKernel.config deleted file mode 100644 index 5c6b47fe8354..000000000000 --- a/inversepath/usbarmory/customKernel.config +++ /dev/null @@ -1,3195 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/arm 4.4.0 Kernel Configuration -# -CONFIG_ARM=y -CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_GENERIC_BUG=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_DMIID=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -# CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_LZMA is not set -# CONFIG_KERNEL_XZ is not set -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set -CONFIG_DEFAULT_HOSTNAME="usbarmory" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_FHANDLE=y -CONFIG_USELIB=y -CONFIG_AUDIT=y -CONFIG_HAVE_ARCH_AUDITSYSCALL=y - -# -# IRQ subsystem -# -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_HANDLE_DOMAIN_IRQ=y -# CONFIG_IRQ_DOMAIN_DEBUG is not set -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -CONFIG_GENERIC_CLOCKEVENTS=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_IRQ_TIME_ACCOUNTING is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set - -# -# RCU Subsystem -# -CONFIG_PREEMPT_RCU=y -# CONFIG_RCU_EXPERT is not set -CONFIG_SRCU=y -# CONFIG_TASKS_RCU is not set -CONFIG_RCU_STALL_COMMON=y -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_RCU_EXPEDITE_BOOT is not set -CONFIG_BUILD_BIN2C=y -CONFIG_IKCONFIG=m -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_CGROUPS=y -# CONFIG_CGROUP_DEBUG is not set -# CONFIG_CGROUP_FREEZER is not set -# CONFIG_CGROUP_PIDS is not set -# CONFIG_CGROUP_DEVICE is not set -# CONFIG_CPUSETS is not set -# CONFIG_CGROUP_CPUACCT is not set -# CONFIG_MEMCG is not set -# CONFIG_CGROUP_SCHED is not set -# CONFIG_BLK_CGROUP is not set -# CONFIG_CHECKPOINT_RESTORE is not set -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -# CONFIG_USER_NS is not set -CONFIG_PID_NS=y -CONFIG_NET_NS=y -# CONFIG_SCHED_AUTOGROUP is not set -# CONFIG_SYSFS_DEPRECATED is not set -# CONFIG_RELAY is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -# CONFIG_RD_BZIP2 is not set -# CONFIG_RD_LZMA is not set -# CONFIG_RD_XZ is not set -# CONFIG_RD_LZO is not set -# CONFIG_RD_LZ4 is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_HAVE_UID16=y -CONFIG_BPF=y -CONFIG_EXPERT=y -CONFIG_UID16=y -CONFIG_MULTIUSER=y -# CONFIG_SGETMASK_SYSCALL is not set -CONFIG_SYSFS_SYSCALL=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -# CONFIG_BPF_SYSCALL is not set -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_ADVISE_SYSCALLS=y -# CONFIG_USERFAULTFD is not set -CONFIG_MEMBARRIER=y -CONFIG_EMBEDDED=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_PERF_USE_VMALLOC=y - -# -# Kernel Performance Events And Counters -# -# CONFIG_PERF_EVENTS is not set -CONFIG_VM_EVENT_COUNTERS=y -# CONFIG_SLUB_DEBUG is not set -CONFIG_COMPAT_BRK=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -# CONFIG_SYSTEM_DATA_VERIFICATION is not set -# CONFIG_PROFILING is not set -CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set -CONFIG_JUMP_LABEL=y -# CONFIG_STATIC_KEYS_SELFTEST is not set -# CONFIG_UPROBES is not set -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -# CONFIG_CC_STACKPROTECTOR is not set -CONFIG_CC_STACKPROTECTOR_NONE=y -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -# CONFIG_CC_STACKPROTECTOR_STRONG is not set -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OLD_SIGACTION=y - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_COMPRESS is not set -CONFIG_BLOCK=y -CONFIG_LBDAF=y -# CONFIG_BLK_DEV_BSG is not set -# CONFIG_BLK_DEV_BSGLIB is not set -# CONFIG_BLK_DEV_INTEGRITY is not set -CONFIG_BLK_CMDLINE_PARSER=y - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_AIX_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_KARMA_PARTITION is not set -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -CONFIG_CMDLINE_PARTITION=y - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=m -CONFIG_IOSCHED_CFQ=m -CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_ASN1=m -CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_FREEZER=y - -# -# System Type -# -CONFIG_MMU=y -CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_CLPS711X is not set -# CONFIG_ARCH_GEMINI is not set -# CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_NETX is not set -# CONFIG_ARCH_IOP13XX is not set -# CONFIG_ARCH_IOP32X is not set -# CONFIG_ARCH_IOP33X is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_DOVE is not set -# CONFIG_ARCH_MV78XX0 is not set -# CONFIG_ARCH_ORION5X is not set -# CONFIG_ARCH_MMP is not set -# CONFIG_ARCH_KS8695 is not set -# CONFIG_ARCH_W90X900 is not set -# CONFIG_ARCH_LPC32XX is not set -# CONFIG_ARCH_PXA is not set -# CONFIG_ARCH_RPC is not set -# CONFIG_ARCH_SA1100 is not set -# CONFIG_ARCH_S3C24XX is not set -# CONFIG_ARCH_S3C64XX is not set -# CONFIG_ARCH_DAVINCI is not set -# CONFIG_ARCH_OMAP1 is not set - -# -# Multiple platform selection -# - -# -# CPU Core family selection -# -# CONFIG_ARCH_MULTI_V6 is not set -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MULTI_V6_V7=y -# CONFIG_ARCH_MULTI_CPU_AUTO is not set -# CONFIG_ARCH_VIRT is not set -# CONFIG_ARCH_MVEBU is not set -# CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_AT91 is not set -# CONFIG_ARCH_BCM is not set -# CONFIG_ARCH_BERLIN is not set -# CONFIG_ARCH_DIGICOLOR is not set -# CONFIG_ARCH_HIGHBANK is not set -# CONFIG_ARCH_HISI is not set -# CONFIG_ARCH_KEYSTONE is not set -# CONFIG_ARCH_MESON is not set -CONFIG_ARCH_MXC=y -CONFIG_MXC_TZIC=y -CONFIG_HAVE_IMX_SRC=y - -# -# Device tree only -# - -# -# Cortex-A platforms -# -CONFIG_SOC_IMX5=y -# CONFIG_SOC_IMX50 is not set -# CONFIG_SOC_IMX51 is not set -CONFIG_SOC_IMX53=y -# CONFIG_SOC_IMX6Q is not set -# CONFIG_SOC_IMX6SL is not set -# CONFIG_SOC_IMX6SX is not set -# CONFIG_SOC_IMX6UL is not set -# CONFIG_SOC_IMX7D is not set -# CONFIG_SOC_LS1021A is not set - -# -# Cortex-A/Cortex-M asymmetric multiprocessing platforms -# -# CONFIG_SOC_VF610 is not set -# CONFIG_ARCH_MEDIATEK is not set - -# -# TI OMAP/AM/DM/DRA Family -# -# CONFIG_ARCH_OMAP3 is not set -# CONFIG_ARCH_OMAP4 is not set -# CONFIG_SOC_OMAP5 is not set -# CONFIG_SOC_AM33XX is not set -# CONFIG_SOC_AM43XX is not set -# CONFIG_SOC_DRA7XX is not set -# CONFIG_ARCH_QCOM is not set -# CONFIG_ARCH_ROCKCHIP is not set -# CONFIG_ARCH_SOCFPGA is not set -# CONFIG_PLAT_SPEAR is not set -# CONFIG_ARCH_STI is not set -# CONFIG_ARCH_S5PV210 is not set -# CONFIG_ARCH_EXYNOS is not set -# CONFIG_ARCH_SHMOBILE_MULTI is not set -# CONFIG_ARCH_SUNXI is not set -# CONFIG_ARCH_SIRF is not set -# CONFIG_ARCH_TEGRA is not set -# CONFIG_ARCH_UNIPHIER is not set -# CONFIG_ARCH_U8500 is not set -# CONFIG_ARCH_VEXPRESS is not set -# CONFIG_ARCH_WM8850 is not set -# CONFIG_ARCH_ZX is not set -# CONFIG_ARCH_ZYNQ is not set - -# -# Processor Type -# -CONFIG_CPU_V7=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_CACHE_V7=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_HAS_ASID=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y - -# -# Processor Features -# -# CONFIG_ARM_LPAE is not set -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARM_THUMB=y -# CONFIG_ARM_THUMBEE is not set -CONFIG_ARM_VIRT_EXT=y -# CONFIG_SWP_EMULATE is not set -# CONFIG_CPU_ICACHE_DISABLE is not set -# CONFIG_CPU_DCACHE_DISABLE is not set -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_KUSER_HELPERS=y -# CONFIG_VDSO is not set -CONFIG_OUTER_CACHE=y -CONFIG_OUTER_CACHE_SYNC=y -CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_CACHE_L2X0=y -# CONFIG_PL310_ERRATA_588369 is not set -# CONFIG_PL310_ERRATA_727915 is not set -# CONFIG_PL310_ERRATA_753970 is not set -# CONFIG_PL310_ERRATA_769419 is not set -CONFIG_ARM_L1_CACHE_SHIFT_6=y -CONFIG_ARM_L1_CACHE_SHIFT=6 -CONFIG_ARM_DMA_MEM_BUFFERABLE=y -CONFIG_ARM_HEAVY_MB=y -# CONFIG_ARM_KERNMEM_PERMS is not set -CONFIG_MULTI_IRQ_HANDLER=y -# CONFIG_ARM_ERRATA_430973 is not set -# CONFIG_ARM_ERRATA_720789 is not set -# CONFIG_ARM_ERRATA_754322 is not set -# CONFIG_ARM_ERRATA_775420 is not set -# CONFIG_ARM_ERRATA_773022 is not set - -# -# Bus support -# -# CONFIG_PCI is not set -# CONFIG_PCI_DOMAINS_GENERIC is not set -# CONFIG_PCI_SYSCALL is not set -# CONFIG_PCCARD is not set - -# -# Kernel Features -# -CONFIG_HAVE_SMP=y -# CONFIG_SMP is not set -# CONFIG_HAVE_ARM_ARCH_TIMER is not set -# CONFIG_VMSPLIT_3G is not set -# CONFIG_VMSPLIT_3G_OPT is not set -CONFIG_VMSPLIT_2G=y -# CONFIG_VMSPLIT_1G is not set -CONFIG_PAGE_OFFSET=0x80000000 -# CONFIG_ARM_PSCI is not set -CONFIG_ARCH_NR_GPIO=0 -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_HZ_FIXED=0 -CONFIG_HZ_100=y -# CONFIG_HZ_200 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_500 is not set -# CONFIG_HZ_1000 is not set -CONFIG_HZ=100 -CONFIG_SCHED_HRTICK=y -# CONFIG_THUMB2_KERNEL is not set -CONFIG_AEABI=y -# CONFIG_OABI_COMPAT is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -CONFIG_HAVE_ARCH_PFN_VALID=y -# CONFIG_HIGHMEM is not set -CONFIG_CPU_SW_DOMAIN_PAN=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -# CONFIG_ARM_MODULE_PLTS is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_NO_BOOTMEM=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=0 -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_NEED_PER_CPU_KM=y -CONFIG_CLEANCACHE=y -# CONFIG_FRONTSWAP is not set -# CONFIG_CMA is not set -CONFIG_ZPOOL=m -CONFIG_ZBUD=m -CONFIG_ZSMALLOC=m -# CONFIG_PGTABLE_MAPPING is not set -# CONFIG_ZSMALLOC_STAT is not set -# CONFIG_IDLE_PAGE_TRACKING is not set -CONFIG_FORCE_MAX_ZONEORDER=11 -CONFIG_ALIGNMENT_TRAP=y -# CONFIG_UACCESS_WITH_MEMCPY is not set -CONFIG_SECCOMP=y -CONFIG_SWIOTLB=y -CONFIG_IOMMU_HELPER=y -# CONFIG_XEN is not set - -# -# Boot options -# -CONFIG_USE_OF=y -CONFIG_ATAGS=y -# CONFIG_DEPRECATED_PARAM_STRUCT is not set -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -# CONFIG_ARM_APPENDED_DTB is not set -CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext4 ip=off" -CONFIG_CMDLINE_FROM_BOOTLOADER=y -# CONFIG_CMDLINE_EXTEND is not set -# CONFIG_CMDLINE_FORCE is not set -# CONFIG_KEXEC is not set -# CONFIG_CRASH_DUMP is not set -CONFIG_AUTO_ZRELADDR=y - -# -# CPU Power Management -# - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=m -# CONFIG_CPU_FREQ_STAT_DETAILS is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# CPU frequency scaling drivers -# -CONFIG_CPUFREQ_DT=y -# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set -# CONFIG_QORIQ_CPUFREQ is not set - -# -# CPU Idle -# -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y - -# -# ARM CPU Idle Drivers -# -# CONFIG_ARM_CPUIDLE is not set -# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set - -# -# Floating point emulation -# - -# -# At least one emulation must be selected -# -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y -# CONFIG_KERNEL_MODE_NEON is not set - -# -# Userspace binary formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_BINFMT_SCRIPT=y -# CONFIG_HAVE_AOUT is not set -# CONFIG_BINFMT_MISC is not set -CONFIG_COREDUMP=y - -# -# Power management options -# -# CONFIG_SUSPEND is not set -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_WAKELOCKS is not set -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -# CONFIG_APM_EMULATION is not set -CONFIG_PM_OPP=y -CONFIG_PM_CLK=y -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set -CONFIG_CPU_PM=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARM_CPU_SUSPEND=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_NET=y -CONFIG_NET_INGRESS=y - -# -# Networking options -# -CONFIG_PACKET=y -# CONFIG_PACKET_DIAG is not set -CONFIG_UNIX=y -# CONFIG_UNIX_DIAG is not set -CONFIG_XFRM=y -CONFIG_XFRM_ALGO=m -CONFIG_XFRM_USER=m -CONFIG_XFRM_SUB_POLICY=y -CONFIG_XFRM_MIGRATE=y -CONFIG_XFRM_STATISTICS=y -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -# CONFIG_IP_FIB_TRIE_STATS is not set -CONFIG_IP_MULTIPLE_TABLES=y -# CONFIG_IP_ROUTE_MULTIPATH is not set -# CONFIG_IP_ROUTE_VERBOSE is not set -# CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -# CONFIG_IP_MROUTE is not set -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -CONFIG_NET_UDP_TUNNEL=m -CONFIG_NET_FOU=m -CONFIG_NET_FOU_IP_TUNNELS=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -# CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -CONFIG_INET_UDP_DIAG=m -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -# CONFIG_TCP_CONG_DCTCP is not set -# CONFIG_TCP_CONG_CDG is not set -CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -# CONFIG_IPV6_ILA is not set -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set -# CONFIG_IPV6_PIMSM_V2 is not set -# CONFIG_NETLABEL is not set -# CONFIG_NETWORK_SECMARK is not set -# CONFIG_NET_PTP_CLASSIFY is not set -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=m - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_INGRESS=y -CONFIG_NETFILTER_NETLINK=m -# CONFIG_NETFILTER_NETLINK_ACCT is not set -# CONFIG_NETFILTER_NETLINK_QUEUE is not set -# CONFIG_NETFILTER_NETLINK_LOG is not set -CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_COMMON=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_PROCFS=y -# CONFIG_NF_CONNTRACK_EVENTS is not set -# CONFIG_NF_CONNTRACK_TIMEOUT is not set -# CONFIG_NF_CONNTRACK_TIMESTAMP is not set -# CONFIG_NF_CT_PROTO_DCCP is not set -CONFIG_NF_CT_PROTO_GRE=m -# CONFIG_NF_CT_PROTO_SCTP is not set -# CONFIG_NF_CT_PROTO_UDPLITE is not set -# CONFIG_NF_CONNTRACK_AMANDA is not set -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -# CONFIG_NF_NAT_AMANDA is not set -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_REDIRECT=m -CONFIG_NETFILTER_SYNPROXY=m -# CONFIG_NF_TABLES is not set -CONFIG_NETFILTER_XTABLES=m - -# -# Xtables combined modules -# -# CONFIG_NETFILTER_XT_MARK is not set -# CONFIG_NETFILTER_XT_CONNMARK is not set - -# -# Xtables targets -# -# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set -# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set -# CONFIG_NETFILTER_XT_TARGET_CT is not set -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -CONFIG_NETFILTER_XT_TARGET_HL=m -# CONFIG_NETFILTER_XT_TARGET_HMARK is not set -# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set -CONFIG_NETFILTER_XT_TARGET_LED=m -# CONFIG_NETFILTER_XT_TARGET_LOG is not set -# CONFIG_NETFILTER_XT_TARGET_MARK is not set -CONFIG_NETFILTER_XT_NAT=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=m -# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set -# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set -# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set -CONFIG_NETFILTER_XT_TARGET_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -# CONFIG_NETFILTER_XT_TARGET_TRACE is not set -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set - -# -# Xtables matches -# -# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set -# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set -# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set -# CONFIG_NETFILTER_XT_MATCH_CPU is not set -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -CONFIG_NETFILTER_XT_MATCH_ECN=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_HELPER is not set -CONFIG_NETFILTER_XT_MATCH_HL=m -# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -# CONFIG_NETFILTER_XT_MATCH_L2TP is not set -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set -CONFIG_NETFILTER_XT_MATCH_MAC=m -# CONFIG_NETFILTER_XT_MATCH_MARK is not set -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set -# CONFIG_NETFILTER_XT_MATCH_OSF is not set -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set -# CONFIG_NETFILTER_XT_MATCH_REALM is not set -# CONFIG_NETFILTER_XT_MATCH_RECENT is not set -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -# CONFIG_IP_SET is not set -# CONFIG_IP_VS is not set - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_PROC_COMPAT=y -CONFIG_NF_DUP_IPV4=m -CONFIG_NF_LOG_ARP=m -CONFIG_NF_LOG_IPV4=m -CONFIG_NF_REJECT_IPV4=m -CONFIG_NF_NAT_IPV4=m -CONFIG_NF_NAT_MASQUERADE_IPV4=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -# CONFIG_IP_NF_SECURITY is not set -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_DUP_IPV6=m -CONFIG_NF_REJECT_IPV6=m -CONFIG_NF_LOG_IPV6=m -CONFIG_NF_NAT_IPV6=m -CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -# CONFIG_IP6_NF_MATCH_RPFILTER is not set -CONFIG_IP6_NF_MATCH_RT=m -# CONFIG_IP6_NF_TARGET_HL is not set -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -# CONFIG_IP6_NF_SECURITY is not set -CONFIG_IP6_NF_NAT=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m -# CONFIG_BRIDGE_NF_EBTABLES is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_RDS is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -CONFIG_L2TP=m -# CONFIG_L2TP_DEBUGFS is not set -# CONFIG_L2TP_V3 is not set -CONFIG_STP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -# CONFIG_BRIDGE_VLAN_FILTERING is not set -CONFIG_HAVE_NET_DSA=y -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -# CONFIG_VLAN_8021Q_MVRP is not set -# CONFIG_DECNET is not set -CONFIG_LLC=m -# CONFIG_LLC2 is not set -# CONFIG_IPX is not set -# CONFIG_ATALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_PHONET is not set -# CONFIG_6LOWPAN is not set -# CONFIG_IEEE802154 is not set -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -# CONFIG_NET_SCH_PRIO is not set -# CONFIG_NET_SCH_MULTIQ is not set -CONFIG_NET_SCH_RED=m -# CONFIG_NET_SCH_SFB is not set -# CONFIG_NET_SCH_SFQ is not set -# CONFIG_NET_SCH_TEQL is not set -# CONFIG_NET_SCH_TBF is not set -# CONFIG_NET_SCH_GRED is not set -# CONFIG_NET_SCH_DSMARK is not set -CONFIG_NET_SCH_NETEM=m -# CONFIG_NET_SCH_DRR is not set -# CONFIG_NET_SCH_MQPRIO is not set -# CONFIG_NET_SCH_CHOKE is not set -# CONFIG_NET_SCH_QFQ is not set -# CONFIG_NET_SCH_CODEL is not set -# CONFIG_NET_SCH_FQ_CODEL is not set -# CONFIG_NET_SCH_FQ is not set -# CONFIG_NET_SCH_HHF is not set -# CONFIG_NET_SCH_PIE is not set -# CONFIG_NET_SCH_PLUG is not set - -# -# Classification -# -CONFIG_NET_CLS=y -# CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set -# CONFIG_NET_CLS_ROUTE4 is not set -CONFIG_NET_CLS_FW=m -# CONFIG_NET_CLS_U32 is not set -# CONFIG_NET_CLS_RSVP is not set -# CONFIG_NET_CLS_RSVP6 is not set -# CONFIG_NET_CLS_FLOW is not set -CONFIG_NET_CLS_CGROUP=m -CONFIG_NET_CLS_BPF=m -# CONFIG_NET_CLS_FLOWER is not set -# CONFIG_NET_EMATCH is not set -# CONFIG_NET_CLS_ACT is not set -# CONFIG_NET_CLS_IND is not set -CONFIG_NET_SCH_FIFO=y -# CONFIG_DCB is not set -# CONFIG_DNS_RESOLVER is not set -# CONFIG_BATMAN_ADV is not set -# CONFIG_OPENVSWITCH is not set -# CONFIG_VSOCKETS is not set -# CONFIG_NETLINK_MMAP is not set -# CONFIG_NETLINK_DIAG is not set -# CONFIG_MPLS is not set -# CONFIG_HSR is not set -# CONFIG_NET_SWITCHDEV is not set -# CONFIG_NET_L3_MASTER_DEV is not set -# CONFIG_CGROUP_NET_PRIO is not set -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -CONFIG_BPF_JIT=y - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set -# CONFIG_AF_RXRPC is not set -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_CFG80211=m -# CONFIG_NL80211_TESTMODE is not set -# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set -# CONFIG_CFG80211_REG_DEBUG is not set -# CONFIG_CFG80211_CERTIFICATION_ONUS is not set -CONFIG_CFG80211_DEFAULT_PS=y -# CONFIG_CFG80211_DEBUGFS is not set -# CONFIG_CFG80211_INTERNAL_REGDB is not set -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_CFG80211_WEXT=y -# CONFIG_LIB80211 is not set -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -# CONFIG_MAC80211_RC_MINSTREL_VHT is not set -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -# CONFIG_MAC80211_MESH is not set -# CONFIG_MAC80211_LEDS is not set -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_MESSAGE_TRACING is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -# CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set -# CONFIG_RFKILL_REGULATOR is not set -# CONFIG_NET_9P is not set -# CONFIG_CAIF is not set -# CONFIG_CEPH_LIB is not set -# CONFIG_NFC is not set -# CONFIG_LWTUNNEL is not set -CONFIG_HAVE_BPF_JIT=y - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER=y -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_STANDALONE is not set -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_FW_LOADER=m -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -# CONFIG_ALLOW_DEV_COREDUMP is not set -# CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_DEVRES is not set -# CONFIG_SYS_HYPERVISOR is not set -# CONFIG_GENERIC_CPU_DEVICES is not set -CONFIG_SOC_BUS=y -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_MMIO=m -# CONFIG_DMA_SHARED_BUFFER is not set - -# -# Bus devices -# -# CONFIG_BRCMSTB_GISB_ARB is not set -# CONFIG_IMX_WEIM is not set -# CONFIG_VEXPRESS_CONFIG is not set -# CONFIG_CONNECTOR is not set -CONFIG_MTD=m -# CONFIG_MTD_TESTS is not set -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_CMDLINE_PARTS is not set -# CONFIG_MTD_AFS_PARTS is not set -CONFIG_MTD_OF_PARTS=m -# CONFIG_MTD_AR7_PARTS is not set - -# -# User Modules And Translation Layers -# -# CONFIG_MTD_BLOCK is not set -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_SM_FTL is not set -# CONFIG_MTD_OOPS is not set -# CONFIG_MTD_SWAP is not set -# CONFIG_MTD_PARTITIONED_MASTER is not set - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -# CONFIG_MTD_RAM is not set -# CONFIG_MTD_ROM is not set -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_DATAFLASH is not set -CONFIG_MTD_M25P80=m -# CONFIG_MTD_SST25L is not set -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -CONFIG_MTD_BLOCK2MTD=m - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOCG3 is not set -# CONFIG_MTD_NAND is not set -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR & LPDDR2 PCM memory drivers -# -# CONFIG_MTD_LPDDR is not set -# CONFIG_MTD_LPDDR2_NVM is not set -CONFIG_MTD_SPI_NOR=m -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y -# CONFIG_SPI_FSL_QUADSPI is not set -# CONFIG_MTD_UBI is not set -CONFIG_DTC=y -CONFIG_OF=y -# CONFIG_OF_UNITTEST is not set -CONFIG_OF_FLATTREE=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_IRQ=y -CONFIG_OF_NET=y -CONFIG_OF_MTD=y -CONFIG_OF_RESERVED_MEM=y -# CONFIG_OF_OVERLAY is not set -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -# CONFIG_PARPORT is not set -CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_NULL_BLK is not set -# CONFIG_ZRAM is not set -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_DRBD is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_RAM is not set -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set -# CONFIG_MG_DISK is not set -# CONFIG_BLK_DEV_RBD is not set - -# -# Misc devices -# -# CONFIG_SENSORS_LIS3LV02D is not set -# CONFIG_AD525X_DPOT is not set -# CONFIG_DUMMY_IRQ is not set -# CONFIG_ICS932S401 is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_APDS9802ALS is not set -# CONFIG_ISL29003 is not set -# CONFIG_ISL29020 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_SENSORS_BH1780 is not set -# CONFIG_SENSORS_BH1770 is not set -# CONFIG_SENSORS_APDS990X is not set -# CONFIG_HMC6352 is not set -# CONFIG_DS1682 is not set -# CONFIG_TI_DAC7512 is not set -# CONFIG_BMP085_I2C is not set -# CONFIG_BMP085_SPI is not set -# CONFIG_USB_SWITCH_FSA9480 is not set -# CONFIG_LATTICE_ECP3_CONFIG is not set -CONFIG_SRAM=y -# CONFIG_C2PORT is not set - -# -# EEPROM support -# -# CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_AT25 is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EEPROM_MAX6875 is not set -CONFIG_EEPROM_93CX6=m -# CONFIG_EEPROM_93XX46 is not set - -# -# Texas Instruments shared transport line discipline -# -# CONFIG_TI_ST is not set -# CONFIG_SENSORS_LIS3_SPI is not set -# CONFIG_SENSORS_LIS3_I2C is not set - -# -# Altera FPGA firmware download module -# -# CONFIG_ALTERA_STAPL is not set - -# -# Intel MIC Bus Driver -# - -# -# SCIF Bus Driver -# - -# -# Intel MIC Host Driver -# - -# -# Intel MIC Card Driver -# - -# -# SCIF Driver -# - -# -# Intel MIC Coprocessor State Management (COSM) Drivers -# -# CONFIG_ECHO is not set -# CONFIG_CXL_BASE is not set -# CONFIG_CXL_KERNEL_API is not set -# CONFIG_CXL_EEH is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=m -# CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -# CONFIG_SCSI_NETLINK is not set -# CONFIG_SCSI_MQ_DEFAULT is not set -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -# CONFIG_CHR_DEV_ST is not set -# CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set -# CONFIG_CHR_DEV_SCH is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set - -# -# SCSI Transports -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_ISCSI_BOOT_SYSFS is not set -# CONFIG_SCSI_UFSHCD is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_DH is not set -# CONFIG_SCSI_OSD_INITIATOR is not set -# CONFIG_ATA is not set -CONFIG_MD=y -# CONFIG_BLK_DEV_MD is not set -# CONFIG_BCACHE is not set -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=y -# CONFIG_DM_MQ_DEFAULT is not set -# CONFIG_DM_DEBUG is not set -CONFIG_DM_BUFIO=y -CONFIG_DM_CRYPT=y -# CONFIG_DM_SNAPSHOT is not set -# CONFIG_DM_THIN_PROVISIONING is not set -# CONFIG_DM_CACHE is not set -# CONFIG_DM_ERA is not set -# CONFIG_DM_MIRROR is not set -# CONFIG_DM_RAID is not set -# CONFIG_DM_ZERO is not set -# CONFIG_DM_MULTIPATH is not set -# CONFIG_DM_DELAY is not set -# CONFIG_DM_UEVENT is not set -# CONFIG_DM_FLAKEY is not set -CONFIG_DM_VERITY=y -# CONFIG_DM_SWITCH is not set -# CONFIG_DM_LOG_WRITES is not set -# CONFIG_TARGET_CORE is not set -CONFIG_NETDEVICES=y -CONFIG_NET_CORE=y -# CONFIG_BONDING is not set -CONFIG_DUMMY=m -# CONFIG_EQUALIZER is not set -# CONFIG_NET_TEAM is not set -# CONFIG_MACVLAN is not set -# CONFIG_IPVLAN is not set -CONFIG_VXLAN=m -# CONFIG_GENEVE is not set -# CONFIG_NETCONSOLE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set -CONFIG_TUN=m -# CONFIG_TUN_VNET_CROSS_LE is not set -CONFIG_VETH=m -# CONFIG_NLMON is not set - -# -# CAIF transport drivers -# - -# -# Distributed Switch Architecture drivers -# -# CONFIG_NET_DSA_MV88E6XXX is not set -# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set -# CONFIG_ETHERNET is not set -# CONFIG_PHYLIB is not set -# CONFIG_MICREL_KS8995MA is not set -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -# CONFIG_PPP_MULTILINK is not set -CONFIG_PPPOE=m -# CONFIG_PPTP is not set -CONFIG_PPPOL2TP=m -# CONFIG_PPP_ASYNC is not set -# CONFIG_PPP_SYNC_TTY is not set -# CONFIG_SLIP is not set -CONFIG_SLHC=m - -# -# Host-side USB support is needed for USB Network Adapter support -# -CONFIG_USB_NET_DRIVERS=m -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_RTL8152 is not set -# CONFIG_USB_LAN78XX is not set -# CONFIG_USB_USBNET is not set -# CONFIG_USB_IPHETH is not set -CONFIG_WLAN=y -# CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_AT76C50X_USB is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -CONFIG_RTL8187=m -# CONFIG_MAC80211_HWSIM is not set -# CONFIG_ATH_CARDS is not set -# CONFIG_B43 is not set -# CONFIG_B43LEGACY is not set -# CONFIG_BRCMSMAC is not set -# CONFIG_BRCMFMAC is not set -# CONFIG_HOSTAP is not set -# CONFIG_LIBERTAS is not set -# CONFIG_P54_COMMON is not set -CONFIG_RT2X00=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -CONFIG_RT2X00_DEBUG=y -# CONFIG_WL_MEDIATEK is not set -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_USB=m -CONFIG_RTLWIFI_DEBUG=y -CONFIG_RTL8192C_COMMON=m -CONFIG_RTL8XXXU=m -# CONFIG_RTL8XXXU_UNTESTED is not set -# CONFIG_WL_TI is not set -# CONFIG_ZD1211RW is not set -# CONFIG_MWIFIEX is not set -# CONFIG_CW1200 is not set -# CONFIG_RSI_91X is not set - -# -# Enable WiMAX (Networking options) to see the WiMAX drivers -# -# CONFIG_WAN is not set -# CONFIG_ISDN is not set -# CONFIG_NVM is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_LEDS=m -# CONFIG_INPUT_FF_MEMLESS is not set -# CONFIG_INPUT_POLLDEV is not set -# CONFIG_INPUT_SPARSEKMAP is not set -# CONFIG_INPUT_MATRIXKMAP is not set - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=m -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_EVDEV=m -# CONFIG_INPUT_EVBUG is not set - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -# CONFIG_KEYBOARD_ADP5588 is not set -# CONFIG_KEYBOARD_ADP5589 is not set -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_QT1070 is not set -# CONFIG_KEYBOARD_QT2160 is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_GPIO is not set -# CONFIG_KEYBOARD_GPIO_POLLED is not set -# CONFIG_KEYBOARD_TCA6416 is not set -# CONFIG_KEYBOARD_TCA8418 is not set -# CONFIG_KEYBOARD_MATRIX is not set -# CONFIG_KEYBOARD_LM8323 is not set -# CONFIG_KEYBOARD_LM8333 is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_MCS is not set -# CONFIG_KEYBOARD_MPR121 is not set -# CONFIG_KEYBOARD_IMX is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_SAMSUNG is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_OMAP4 is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_CAP11XX is not set -# CONFIG_KEYBOARD_BCM is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -# CONFIG_MOUSE_PS2_ALPS is not set -# CONFIG_MOUSE_PS2_LOGIPS2PP is not set -# CONFIG_MOUSE_PS2_SYNAPTICS is not set -# CONFIG_MOUSE_PS2_CYPRESS is not set -# CONFIG_MOUSE_PS2_TRACKPOINT is not set -# CONFIG_MOUSE_PS2_ELANTECH is not set -# CONFIG_MOUSE_PS2_SENTELIC is not set -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_PS2_FOCALTECH=y -CONFIG_MOUSE_SERIAL=m -# CONFIG_MOUSE_APPLETOUCH is not set -# CONFIG_MOUSE_BCM5974 is not set -# CONFIG_MOUSE_CYAPA is not set -# CONFIG_MOUSE_ELAN_I2C is not set -# CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_MOUSE_GPIO is not set -# CONFIG_MOUSE_SYNAPTICS_I2C is not set -CONFIG_MOUSE_SYNAPTICS_USB=m -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_PROPERTIES=y -# CONFIG_TOUCHSCREEN_ADS7846 is not set -# CONFIG_TOUCHSCREEN_AD7877 is not set -# CONFIG_TOUCHSCREEN_AD7879 is not set -# CONFIG_TOUCHSCREEN_AR1021_I2C is not set -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set -# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set -# CONFIG_TOUCHSCREEN_BU21013 is not set -# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set -# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set -# CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set -# CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set -# CONFIG_TOUCHSCREEN_DYNAPRO is not set -# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set -# CONFIG_TOUCHSCREEN_EETI is not set -# CONFIG_TOUCHSCREEN_EGALAX is not set -# CONFIG_TOUCHSCREEN_FT6236 is not set -# CONFIG_TOUCHSCREEN_FUJITSU is not set -# CONFIG_TOUCHSCREEN_GOODIX is not set -# CONFIG_TOUCHSCREEN_ILI210X is not set -# CONFIG_TOUCHSCREEN_GUNZE is not set -# CONFIG_TOUCHSCREEN_ELAN is not set -# CONFIG_TOUCHSCREEN_ELO is not set -# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set -# CONFIG_TOUCHSCREEN_WACOM_I2C is not set -# CONFIG_TOUCHSCREEN_MAX11801 is not set -# CONFIG_TOUCHSCREEN_MCS5000 is not set -# CONFIG_TOUCHSCREEN_MMS114 is not set -# CONFIG_TOUCHSCREEN_MTOUCH is not set -# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set -# CONFIG_TOUCHSCREEN_INEXIO is not set -# CONFIG_TOUCHSCREEN_MK712 is not set -# CONFIG_TOUCHSCREEN_PENMOUNT is not set -# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set -# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set -# CONFIG_TOUCHSCREEN_TOUCHWIN is not set -# CONFIG_TOUCHSCREEN_PIXCIR is not set -# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -# CONFIG_TOUCHSCREEN_USB_EGALAX is not set -# CONFIG_TOUCHSCREEN_USB_PANJIT is not set -# CONFIG_TOUCHSCREEN_USB_3M is not set -# CONFIG_TOUCHSCREEN_USB_ITM is not set -# CONFIG_TOUCHSCREEN_USB_ETURBO is not set -# CONFIG_TOUCHSCREEN_USB_GUNZE is not set -# CONFIG_TOUCHSCREEN_USB_DMC_TSC10 is not set -# CONFIG_TOUCHSCREEN_USB_IRTOUCH is not set -# CONFIG_TOUCHSCREEN_USB_IDEALTEK is not set -# CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH is not set -# CONFIG_TOUCHSCREEN_USB_GOTOP is not set -# CONFIG_TOUCHSCREEN_USB_JASTEC is not set -# CONFIG_TOUCHSCREEN_USB_ELO is not set -CONFIG_TOUCHSCREEN_USB_E2I=y -# CONFIG_TOUCHSCREEN_USB_ZYTRONIC is not set -# CONFIG_TOUCHSCREEN_USB_ETT_TC45USB is not set -# CONFIG_TOUCHSCREEN_USB_NEXIO is not set -# CONFIG_TOUCHSCREEN_USB_EASYTOUCH is not set -# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set -# CONFIG_TOUCHSCREEN_TSC_SERIO is not set -# CONFIG_TOUCHSCREEN_TSC2004 is not set -# CONFIG_TOUCHSCREEN_TSC2005 is not set -# CONFIG_TOUCHSCREEN_TSC2007 is not set -# CONFIG_TOUCHSCREEN_ST1232 is not set -# CONFIG_TOUCHSCREEN_SX8654 is not set -# CONFIG_TOUCHSCREEN_TPS6507X is not set -# CONFIG_TOUCHSCREEN_ZFORCE is not set -# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set -# CONFIG_INPUT_MISC is not set - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -CONFIG_SERIO_LIBPS2=y -# CONFIG_SERIO_RAW is not set -# CONFIG_SERIO_ALTERA_PS2 is not set -# CONFIG_SERIO_PS2MULT is not set -# CONFIG_SERIO_ARC_PS2 is not set -# CONFIG_SERIO_APBPS2 is not set -# CONFIG_USERIO is not set -# CONFIG_GAMEPORT is not set - -# -# Character devices -# -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -# CONFIG_SERIAL_NONSTANDARD is not set -# CONFIG_N_GSM is not set -# CONFIG_TRACE_SINK is not set -CONFIG_DEVMEM=y -CONFIG_DEVKMEM=y - -# -# Serial drivers -# -CONFIG_SERIAL_EARLYCON=y -# CONFIG_SERIAL_8250 is not set - -# -# Non-8250 serial port support -# -# CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set -# CONFIG_SERIAL_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -# CONFIG_SERIAL_UARTLITE is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_SCCNXP is not set -# CONFIG_SERIAL_SC16IS7XX is not set -# CONFIG_SERIAL_BCM63XX is not set -# CONFIG_SERIAL_ALTERA_JTAGUART is not set -# CONFIG_SERIAL_ALTERA_UART is not set -# CONFIG_SERIAL_IFX6X60 is not set -# CONFIG_SERIAL_XILINX_PS_UART is not set -# CONFIG_SERIAL_ARC is not set -# CONFIG_SERIAL_FSL_LPUART is not set -# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set -# CONFIG_SERIAL_ST_ASC is not set -# CONFIG_SERIAL_STM32 is not set -# CONFIG_TTY_PRINTK is not set -# CONFIG_HVC_DCC is not set -# CONFIG_IPMI_HANDLER is not set -CONFIG_HW_RANDOM=m -# CONFIG_HW_RANDOM_TIMERIOMEM is not set -# CONFIG_R3964 is not set -# CONFIG_RAW_DRIVER is not set -# CONFIG_TCG_TPM is not set -# CONFIG_XILLYBUS is not set - -# -# I2C support -# -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=m -# CONFIG_I2C_MUX is not set -CONFIG_I2C_HELPER_AUTO=y - -# -# I2C Hardware Bus support -# - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -# CONFIG_I2C_CBUS_GPIO is not set -# CONFIG_I2C_DESIGNWARE_PLATFORM is not set -# CONFIG_I2C_EMEV2 is not set -# CONFIG_I2C_GPIO is not set -CONFIG_I2C_IMX=m -# CONFIG_I2C_OCORES is not set -# CONFIG_I2C_PCA_PLATFORM is not set -# CONFIG_I2C_PXA_PCI is not set -# CONFIG_I2C_RK3X is not set -# CONFIG_I2C_SIMTEC is not set -# CONFIG_I2C_XILINX is not set - -# -# External I2C/SMBus adapter drivers -# -# CONFIG_I2C_DIOLAN_U2C is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_ROBOTFUZZ_OSIF is not set -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_SLAVE is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -CONFIG_SPI=y -CONFIG_SPI_DEBUG=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -CONFIG_SPI_BITBANG=m -# CONFIG_SPI_CADENCE is not set -# CONFIG_SPI_GPIO is not set -CONFIG_SPI_IMX=m -# CONFIG_SPI_FSL_SPI is not set -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PXA2XX_PCI is not set -# CONFIG_SPI_ROCKCHIP is not set -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_ZYNQMP_GQSPI is not set -# CONFIG_SPI_DESIGNWARE is not set - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=m -# CONFIG_SPI_TLE62X0 is not set -# CONFIG_SPMI is not set -# CONFIG_HSI is not set - -# -# PPS support -# -CONFIG_PPS=y -# CONFIG_PPS_DEBUG is not set - -# -# PPS clients support -# -# CONFIG_PPS_CLIENT_KTIMER is not set -# CONFIG_PPS_CLIENT_LDISC is not set -# CONFIG_PPS_CLIENT_GPIO is not set - -# -# PPS generators support -# - -# -# PTP clock support -# -# CONFIG_PTP_1588_CLOCK is not set - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -CONFIG_PINCTRL=y - -# -# Pin controllers -# -CONFIG_PINMUX=y -CONFIG_PINCONF=y -# CONFIG_DEBUG_PINCTRL is not set -# CONFIG_PINCTRL_AMD is not set -# CONFIG_PINCTRL_SINGLE is not set -CONFIG_PINCTRL_IMX=y -CONFIG_PINCTRL_IMX53=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_OF_GPIO=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=y - -# -# Memory mapped GPIO drivers -# -# CONFIG_GPIO_74XX_MMIO is not set -# CONFIG_GPIO_ALTERA is not set -# CONFIG_GPIO_DWAPB is not set -# CONFIG_GPIO_EM is not set -CONFIG_GPIO_GENERIC_PLATFORM=y -# CONFIG_GPIO_GRGPIO is not set -CONFIG_GPIO_MXC=y -# CONFIG_GPIO_XILINX is not set -# CONFIG_GPIO_ZEVIO is not set -# CONFIG_GPIO_ZX is not set - -# -# I2C GPIO expanders -# -# CONFIG_GPIO_ADP5588 is not set -# CONFIG_GPIO_ADNP is not set -# CONFIG_GPIO_MAX7300 is not set -# CONFIG_GPIO_MAX732X is not set -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set - -# -# MFD GPIO expanders -# - -# -# SPI GPIO expanders -# -# CONFIG_GPIO_74X164 is not set -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MC33880 is not set - -# -# SPI or I2C GPIO expanders -# -# CONFIG_GPIO_MCP23S08 is not set - -# -# USB GPIO expanders -# -# CONFIG_W1 is not set -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set -# CONFIG_TEST_POWER is not set -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2781 is not set -# CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_SBS is not set -# CONFIG_BATTERY_BQ27XXX is not set -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -# CONFIG_CHARGER_ISP1704 is not set -# CONFIG_CHARGER_MAX8903 is not set -# CONFIG_CHARGER_LP8727 is not set -# CONFIG_CHARGER_GPIO is not set -# CONFIG_CHARGER_MANAGER is not set -# CONFIG_CHARGER_BQ2415X is not set -# CONFIG_CHARGER_BQ24190 is not set -# CONFIG_CHARGER_BQ24257 is not set -# CONFIG_CHARGER_BQ24735 is not set -# CONFIG_CHARGER_BQ25890 is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_CHARGER_RT9455 is not set -# CONFIG_POWER_RESET is not set -CONFIG_POWER_AVS=y -# CONFIG_HWMON is not set -# CONFIG_THERMAL is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_GPIO_WATCHDOG=m -# CONFIG_XILINX_WATCHDOG is not set -# CONFIG_CADENCE_WATCHDOG is not set -# CONFIG_DW_WATCHDOG is not set -# CONFIG_MAX63XX_WATCHDOG is not set -CONFIG_IMX2_WDT=m -# CONFIG_BCM7038_WDT is not set -# CONFIG_MEN_A21_WDT is not set - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -# CONFIG_SSB is not set -CONFIG_BCMA_POSSIBLE=y - -# -# Broadcom specific AMBA -# -# CONFIG_BCMA is not set - -# -# Multifunction device drivers -# -# CONFIG_MFD_CORE is not set -# CONFIG_MFD_ATMEL_FLEXCOM is not set -# CONFIG_MFD_ATMEL_HLCDC is not set -# CONFIG_MFD_BCM590XX is not set -# CONFIG_MFD_CROS_EC is not set -# CONFIG_MFD_ASIC3 is not set -# CONFIG_MFD_DA9052_SPI is not set -# CONFIG_MFD_DLN2 is not set -# CONFIG_MFD_MC13XXX_SPI is not set -# CONFIG_MFD_MC13XXX_I2C is not set -# CONFIG_MFD_HI6421_PMIC is not set -# CONFIG_HTC_EGPIO is not set -# CONFIG_HTC_PASIC3 is not set -# CONFIG_MFD_KEMPLD is not set -# CONFIG_MFD_MT6397 is not set -# CONFIG_MFD_MENF21BMC is not set -# CONFIG_EZX_PCAP is not set -# CONFIG_MFD_VIPERBOARD is not set -# CONFIG_MFD_RETU is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_PM8921_CORE is not set -# CONFIG_MFD_RTSX_USB is not set -# CONFIG_MFD_RK808 is not set -# CONFIG_MFD_RN5T618 is not set -# CONFIG_MFD_SI476X_CORE is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_MFD_SKY81452 is not set -# CONFIG_ABX500_CORE is not set -# CONFIG_MFD_STMPE is not set -# CONFIG_MFD_SYSCON is not set -# CONFIG_MFD_TI_AM335X_TSCADC is not set -# CONFIG_MFD_LP3943 is not set -# CONFIG_TPS6105X is not set -# CONFIG_TPS65010 is not set -# CONFIG_TPS6507X is not set -# CONFIG_MFD_TPS65217 is not set -# CONFIG_MFD_TPS65218 is not set -# CONFIG_MFD_TPS65912 is not set -# CONFIG_MFD_TPS65912_SPI is not set -# CONFIG_MFD_WL1273_CORE is not set -# CONFIG_MFD_LM3533 is not set -# CONFIG_MFD_TMIO is not set -# CONFIG_MFD_T7L66XB is not set -# CONFIG_MFD_TC6387XB is not set -# CONFIG_MFD_TC6393XB is not set -# CONFIG_MFD_ARIZONA_I2C is not set -# CONFIG_MFD_ARIZONA_SPI is not set -# CONFIG_MFD_WM831X_SPI is not set -# CONFIG_MFD_WM8994 is not set -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set -# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set -# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set -# CONFIG_REGULATOR_ACT8865 is not set -# CONFIG_REGULATOR_AD5398 is not set -# CONFIG_REGULATOR_DA9210 is not set -# CONFIG_REGULATOR_DA9211 is not set -# CONFIG_REGULATOR_FAN53555 is not set -# CONFIG_REGULATOR_GPIO is not set -# CONFIG_REGULATOR_ISL9305 is not set -# CONFIG_REGULATOR_ISL6271A is not set -# CONFIG_REGULATOR_LP3971 is not set -# CONFIG_REGULATOR_LP3972 is not set -# CONFIG_REGULATOR_LP872X is not set -# CONFIG_REGULATOR_LP8755 is not set -CONFIG_REGULATOR_LTC3589=m -# CONFIG_REGULATOR_MAX1586 is not set -# CONFIG_REGULATOR_MAX8649 is not set -# CONFIG_REGULATOR_MAX8660 is not set -# CONFIG_REGULATOR_MAX8952 is not set -# CONFIG_REGULATOR_MAX8973 is not set -# CONFIG_REGULATOR_MT6311 is not set -# CONFIG_REGULATOR_PFUZE100 is not set -# CONFIG_REGULATOR_TPS51632 is not set -# CONFIG_REGULATOR_TPS62360 is not set -# CONFIG_REGULATOR_TPS65023 is not set -# CONFIG_REGULATOR_TPS6507X is not set -# CONFIG_REGULATOR_TPS6524X is not set -# CONFIG_MEDIA_SUPPORT is not set - -# -# Graphics support -# -# CONFIG_DRM is not set - -# -# Frame buffer Devices -# -# CONFIG_FB is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -# CONFIG_VGASTATE is not set - -# -# Console display driver support -# -CONFIG_DUMMY_CONSOLE=y -# CONFIG_SOUND is not set - -# -# HID support -# -CONFIG_HID=y -# CONFIG_HID_BATTERY_STRENGTH is not set -# CONFIG_HIDRAW is not set -# CONFIG_UHID is not set -CONFIG_HID_GENERIC=m - -# -# Special HID drivers -# -# CONFIG_HID_A4TECH is not set -# CONFIG_HID_ACRUX is not set -# CONFIG_HID_APPLE is not set -# CONFIG_HID_APPLEIR is not set -# CONFIG_HID_AUREAL is not set -# CONFIG_HID_BELKIN is not set -# CONFIG_HID_BETOP_FF is not set -# CONFIG_HID_CHERRY is not set -# CONFIG_HID_CHICONY is not set -# CONFIG_HID_CORSAIR is not set -# CONFIG_HID_CP2112 is not set -# CONFIG_HID_CYPRESS is not set -# CONFIG_HID_DRAGONRISE is not set -# CONFIG_HID_EMS_FF is not set -# CONFIG_HID_ELECOM is not set -# CONFIG_HID_ELO is not set -# CONFIG_HID_EZKEY is not set -# CONFIG_HID_GEMBIRD is not set -# CONFIG_HID_GFRM is not set -# CONFIG_HID_HOLTEK is not set -# CONFIG_HID_GT683R is not set -# CONFIG_HID_KEYTOUCH is not set -# CONFIG_HID_KYE is not set -# CONFIG_HID_UCLOGIC is not set -# CONFIG_HID_WALTOP is not set -# CONFIG_HID_GYRATION is not set -# CONFIG_HID_ICADE is not set -# CONFIG_HID_TWINHAN is not set -# CONFIG_HID_KENSINGTON is not set -# CONFIG_HID_LCPOWER is not set -# CONFIG_HID_LENOVO is not set -# CONFIG_HID_LOGITECH is not set -# CONFIG_HID_MAGICMOUSE is not set -# CONFIG_HID_MICROSOFT is not set -# CONFIG_HID_MONTEREY is not set -# CONFIG_HID_MULTITOUCH is not set -# CONFIG_HID_NTRIG is not set -# CONFIG_HID_ORTEK is not set -# CONFIG_HID_PANTHERLORD is not set -# CONFIG_HID_PENMOUNT is not set -# CONFIG_HID_PETALYNX is not set -# CONFIG_HID_PICOLCD is not set -# CONFIG_HID_PLANTRONICS is not set -# CONFIG_HID_PRIMAX is not set -# CONFIG_HID_ROCCAT is not set -# CONFIG_HID_SAITEK is not set -# CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SONY is not set -# CONFIG_HID_SPEEDLINK is not set -# CONFIG_HID_STEELSERIES is not set -# CONFIG_HID_SUNPLUS is not set -# CONFIG_HID_RMI is not set -# CONFIG_HID_GREENASIA is not set -# CONFIG_HID_SMARTJOYPLUS is not set -# CONFIG_HID_TIVO is not set -# CONFIG_HID_TOPSEED is not set -# CONFIG_HID_THINGM is not set -# CONFIG_HID_THRUSTMASTER is not set -# CONFIG_HID_WACOM is not set -# CONFIG_HID_WIIMOTE is not set -# CONFIG_HID_XINMO is not set -# CONFIG_HID_ZEROPLUS is not set -# CONFIG_HID_ZYDACRON is not set -# CONFIG_HID_SENSOR_HUB is not set - -# -# USB HID support -# -CONFIG_USB_HID=m -# CONFIG_HID_PID is not set -CONFIG_USB_HIDDEV=y - -# -# USB HID Boot Protocol drivers -# -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m - -# -# I2C HID support -# -# CONFIG_I2C_HID is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=m -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=m -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set - -# -# Miscellaneous USB options -# -CONFIG_USB_DEFAULT_PERSIST=y -# CONFIG_USB_DYNAMIC_MINORS is not set -CONFIG_USB_OTG=y -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_OTG_FSM is not set -# CONFIG_USB_ULPI_BUS is not set -# CONFIG_USB_MON is not set -# CONFIG_USB_WUSB_CBAF is not set - -# -# USB Host Controller Drivers -# -# CONFIG_USB_C67X00_HCD is not set -# CONFIG_USB_XHCI_HCD is not set -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -# CONFIG_USB_EHCI_MXC is not set -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -# CONFIG_USB_OXU210HP_HCD is not set -# CONFIG_USB_ISP116X_HCD is not set -# CONFIG_USB_ISP1362_HCD is not set -# CONFIG_USB_FOTG210_HCD is not set -# CONFIG_USB_MAX3421_HCD is not set -# CONFIG_USB_OHCI_HCD is not set -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_IMX21_HCD is not set -# CONFIG_USB_HCD_TEST_MODE is not set - -# -# USB Device Class drivers -# -# CONFIG_USB_ACM is not set -# CONFIG_USB_PRINTER is not set -# CONFIG_USB_WDM is not set -# CONFIG_USB_TMC is not set - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -# CONFIG_USB_STORAGE_REALTEK is not set -# CONFIG_USB_STORAGE_DATAFAB is not set -# CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set -# CONFIG_USB_STORAGE_USBAT is not set -# CONFIG_USB_STORAGE_SDDR09 is not set -# CONFIG_USB_STORAGE_SDDR55 is not set -# CONFIG_USB_STORAGE_JUMPSHOT is not set -# CONFIG_USB_STORAGE_ALAUDA is not set -# CONFIG_USB_STORAGE_ONETOUCH is not set -# CONFIG_USB_STORAGE_KARMA is not set -# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set -# CONFIG_USB_STORAGE_ENE_UB6250 is not set -# CONFIG_USB_UAS is not set - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set -# CONFIG_USBIP_CORE is not set -# CONFIG_USB_MUSB_HDRC is not set -# CONFIG_USB_DWC3 is not set -# CONFIG_USB_DWC2 is not set -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_OF=m -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_CHIPIDEA_DEBUG=y -# CONFIG_USB_ISP1760 is not set - -# -# USB port drivers -# -# CONFIG_USB_SERIAL is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_ADUTUX is not set -# CONFIG_USB_SEVSEG is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_LED is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set -# CONFIG_USB_EHSET_TEST_FIXTURE is not set -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_YUREX is not set -# CONFIG_USB_EZUSB_FX2 is not set -# CONFIG_USB_HSIC_USB3503 is not set -# CONFIG_USB_LINK_LAYER_TEST is not set -# CONFIG_USB_CHAOSKEY is not set - -# -# USB Physical Layer drivers -# -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=y -# CONFIG_AM335X_PHY_USB is not set -# CONFIG_USB_GPIO_VBUS is not set -# CONFIG_USB_ISP1301 is not set -# CONFIG_USB_MXS_PHY is not set -# CONFIG_USB_ULPI is not set -CONFIG_USB_GADGET=m -# CONFIG_USB_GADGET_DEBUG is not set -# CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_DEBUG_FS=y -CONFIG_USB_GADGET_VBUS_DRAW=500 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 - -# -# USB Peripheral Controller -# -# CONFIG_USB_FSL_USB2 is not set -# CONFIG_USB_FUSB300 is not set -# CONFIG_USB_FOTG210_UDC is not set -# CONFIG_USB_GR_UDC is not set -# CONFIG_USB_R8A66597 is not set -# CONFIG_USB_PXA27X is not set -# CONFIG_USB_MV_UDC is not set -# CONFIG_USB_MV_U3D is not set -# CONFIG_USB_M66592 is not set -# CONFIG_USB_BDC_UDC is not set -# CONFIG_USB_NET2272 is not set -# CONFIG_USB_GADGET_XILINX is not set -# CONFIG_USB_DUMMY_HCD is not set -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_F_SS_LB=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_U_ETHER=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -CONFIG_USB_F_NCM=m -CONFIG_USB_F_ECM=m -CONFIG_USB_F_EEM=m -CONFIG_USB_F_SUBSET=m -CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m -CONFIG_USB_F_FS=m -CONFIG_USB_F_HID=m -CONFIG_USB_F_PRINTER=m -CONFIG_USB_CONFIGFS=m -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_OBEX=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_LB_SS=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_USB_CONFIGFS_F_PRINTER=y -CONFIG_USB_ZERO=m -# CONFIG_USB_ZERO_HNPTEST is not set -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_PRINTER=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_USB_G_ACM_MS=m -CONFIG_USB_G_MULTI=m -CONFIG_USB_G_MULTI_RNDIS=y -CONFIG_USB_G_MULTI_CDC=y -CONFIG_USB_G_HID=m -# CONFIG_USB_G_DBGP is not set -# CONFIG_USB_LED_TRIG is not set -# CONFIG_UWB is not set -CONFIG_MMC=y -# CONFIG_MMC_DEBUG is not set - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=8 -CONFIG_MMC_BLOCK_BOUNCE=y -# CONFIG_SDIO_UART is not set -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_IO_ACCESSORS=y -CONFIG_MMC_SDHCI_PLTFM=y -# CONFIG_MMC_SDHCI_OF_ARASAN is not set -# CONFIG_MMC_SDHCI_OF_AT91 is not set -# CONFIG_MMC_SDHCI_OF_ESDHC is not set -CONFIG_MMC_SDHCI_ESDHC_IMX=y -# CONFIG_MMC_SDHCI_F_SDH30 is not set -# CONFIG_MMC_MXC is not set -# CONFIG_MMC_SPI is not set -# CONFIG_MMC_DW is not set -# CONFIG_MMC_VUB300 is not set -# CONFIG_MMC_USHC is not set -# CONFIG_MMC_USDHI6ROL0 is not set -# CONFIG_MMC_MTK is not set -# CONFIG_MEMSTICK is not set -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m -# CONFIG_LEDS_CLASS_FLASH is not set - -# -# LED drivers -# -# CONFIG_LEDS_BCM6328 is not set -# CONFIG_LEDS_BCM6358 is not set -# CONFIG_LEDS_LM3530 is not set -# CONFIG_LEDS_LM3642 is not set -# CONFIG_LEDS_PCA9532 is not set -CONFIG_LEDS_GPIO=m -# CONFIG_LEDS_LP3944 is not set -# CONFIG_LEDS_LP5521 is not set -# CONFIG_LEDS_LP5523 is not set -# CONFIG_LEDS_LP5562 is not set -# CONFIG_LEDS_LP8501 is not set -# CONFIG_LEDS_LP8860 is not set -# CONFIG_LEDS_PCA955X is not set -# CONFIG_LEDS_PCA963X is not set -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_REGULATOR is not set -# CONFIG_LEDS_BD2802 is not set -# CONFIG_LEDS_LT3593 is not set -# CONFIG_LEDS_TCA6507 is not set -# CONFIG_LEDS_TLC591XX is not set -# CONFIG_LEDS_LM355x is not set - -# -# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) -# -# CONFIG_LEDS_BLINKM is not set - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_LEDS_TRIGGER_TRANSIENT=m -# CONFIG_LEDS_TRIGGER_CAMERA is not set -# CONFIG_ACCESSIBILITY is not set -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -# CONFIG_EDAC is not set -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -# CONFIG_RTC_DRV_TEST is not set - -# -# I2C RTC drivers -# -# CONFIG_RTC_DRV_ABB5ZES3 is not set -# CONFIG_RTC_DRV_ABX80X is not set -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_DS3232 is not set -# CONFIG_RTC_DRV_HYM8563 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_ISL12022 is not set -# CONFIG_RTC_DRV_ISL12057 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF2127 is not set -# CONFIG_RTC_DRV_PCF8523 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF85063 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_BQ32K is not set -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8581 is not set -# CONFIG_RTC_DRV_RX8025 is not set -# CONFIG_RTC_DRV_EM3027 is not set -# CONFIG_RTC_DRV_RV3029C2 is not set -# CONFIG_RTC_DRV_RV8803 is not set - -# -# SPI RTC drivers -# -# CONFIG_RTC_DRV_M41T93 is not set -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1343 is not set -# CONFIG_RTC_DRV_DS1347 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_RX4581 is not set -# CONFIG_RTC_DRV_MCP795 is not set - -# -# Platform RTC drivers -# -# CONFIG_RTC_DRV_CMOS is not set -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1685_FAMILY is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_DS2404 is not set -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_MSM6242 is not set -# CONFIG_RTC_DRV_BQ4802 is not set -# CONFIG_RTC_DRV_RP5C01 is not set -# CONFIG_RTC_DRV_V3020 is not set -# CONFIG_RTC_DRV_ZYNQMP is not set - -# -# on-CPU RTC drivers -# -CONFIG_RTC_DRV_IMXDI=y -CONFIG_RTC_DRV_MXC=y -# CONFIG_RTC_DRV_SNVS is not set - -# -# HID Sensor RTC drivers -# -# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_DMA_ENGINE=y -CONFIG_DMA_OF=y -# CONFIG_FSL_EDMA is not set -# CONFIG_IMX_DMA is not set -CONFIG_IMX_SDMA=m -# CONFIG_INTEL_IDMA64 is not set -# CONFIG_MX3_IPU is not set -# CONFIG_NBPFAXI_DMA is not set -# CONFIG_DW_DMAC is not set - -# -# DMA Clients -# -# CONFIG_ASYNC_TX_DMA is not set -# CONFIG_DMATEST is not set -# CONFIG_AUXDISPLAY is not set -# CONFIG_UIO is not set -# CONFIG_VIRT_DRIVERS is not set - -# -# Virtio drivers -# -# CONFIG_VIRTIO_MMIO is not set - -# -# Microsoft Hyper-V guest support -# -# CONFIG_STAGING is not set -# CONFIG_CHROME_PLATFORMS is not set -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -# CONFIG_COMMON_CLK_SI5351 is not set -# CONFIG_COMMON_CLK_SI514 is not set -# CONFIG_COMMON_CLK_SI570 is not set -# CONFIG_COMMON_CLK_CDCE925 is not set -# CONFIG_CLK_QORIQ is not set -# CONFIG_COMMON_CLK_PXA is not set -# CONFIG_COMMON_CLK_CDCE706 is not set - -# -# Hardware Spinlock drivers -# - -# -# Clock Source drivers -# -CONFIG_CLKSRC_OF=y -CONFIG_CLKSRC_PROBE=y -CONFIG_CLKSRC_MMIO=y -# CONFIG_ARM_TIMER_SP804 is not set -# CONFIG_ATMEL_PIT is not set -# CONFIG_SH_TIMER_CMT is not set -# CONFIG_SH_TIMER_MTU2 is not set -# CONFIG_SH_TIMER_TMU is not set -# CONFIG_EM_TIMER_STI is not set -CONFIG_CLKSRC_IMX_GPT=y -# CONFIG_MAILBOX is not set -CONFIG_IOMMU_SUPPORT=y - -# -# Generic IOMMU Pagetable Support -# -# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set -# CONFIG_ARM_SMMU is not set - -# -# Remoteproc drivers -# -# CONFIG_STE_MODEM_RPROC is not set - -# -# Rpmsg drivers -# - -# -# SOC (System On Chip) specific Drivers -# -# CONFIG_SOC_BRCMSTB is not set -# CONFIG_SUNXI_SRAM is not set -# CONFIG_SOC_TI is not set -# CONFIG_PM_DEVFREQ is not set -CONFIG_EXTCON=m - -# -# Extcon Device Drivers -# -# CONFIG_EXTCON_GPIO is not set -# CONFIG_EXTCON_RT8973A is not set -# CONFIG_EXTCON_SM5502 is not set -# CONFIG_EXTCON_USB_GPIO is not set -# CONFIG_MEMORY is not set -# CONFIG_IIO is not set -# CONFIG_PWM is not set -CONFIG_IRQCHIP=y -# CONFIG_IPACK_BUS is not set -CONFIG_ARCH_HAS_RESET_CONTROLLER=y -# CONFIG_RESET_CONTROLLER is not set -# CONFIG_FMC is not set - -# -# PHY Subsystem -# -# CONFIG_GENERIC_PHY is not set -# CONFIG_PHY_PXA_28NM_HSIC is not set -# CONFIG_PHY_PXA_28NM_USB2 is not set -# CONFIG_BCM_KONA_USB2_PHY is not set -# CONFIG_POWERCAP is not set -# CONFIG_MCB is not set - -# -# Performance monitor support -# -# CONFIG_RAS is not set - -# -# Android -# -# CONFIG_ANDROID is not set -# CONFIG_NVMEM is not set -# CONFIG_STM is not set -# CONFIG_STM_DUMMY is not set -# CONFIG_STM_SOURCE_CONSOLE is not set -# CONFIG_INTEL_TH is not set - -# -# FPGA Configuration Support -# -# CONFIG_FPGA is not set - -# -# Firmware Drivers -# -# CONFIG_FIRMWARE_MEMMAP is not set - -# -# File systems -# -CONFIG_DCACHE_WORD_ACCESS=y -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4_USE_FOR_EXT2=y -# CONFIG_EXT4_FS_POSIX_ACL is not set -# CONFIG_EXT4_FS_SECURITY is not set -# CONFIG_EXT4_ENCRYPTION is not set -# CONFIG_EXT4_DEBUG is not set -CONFIG_JBD2=y -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=y -# CONFIG_REISERFS_FS is not set -# CONFIG_JFS_FS is not set -# CONFIG_XFS_FS is not set -# CONFIG_GFS2_FS is not set -# CONFIG_OCFS2_FS is not set -# CONFIG_BTRFS_FS is not set -# CONFIG_NILFS2_FS is not set -# CONFIG_F2FS_FS is not set -# CONFIG_FS_POSIX_ACL is not set -CONFIG_EXPORTFS=y -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -# CONFIG_FANOTIFY is not set -# CONFIG_QUOTA is not set -# CONFIG_QUOTACTL is not set -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=m -# CONFIG_CUSE is not set -CONFIG_OVERLAY_FS=y - -# -# Caches -# -# CONFIG_FSCACHE is not set - -# -# CD-ROM/DVD Filesystems -# -# CONFIG_ISO9660_FS is not set -# CONFIG_UDF_FS is not set - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -# CONFIG_PROC_CHILDREN is not set -CONFIG_KERNFS=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y -# CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=y -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=m -CONFIG_ECRYPT_FS_MESSAGING=y -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -# CONFIG_JFFS2_FS_XATTR is not set -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -# CONFIG_JFFS2_LZO is not set -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -# CONFIG_LOGFS is not set -# CONFIG_CRAMFS is not set -CONFIG_SQUASHFS=y -# CONFIG_SQUASHFS_FILE_CACHE is not set -CONFIG_SQUASHFS_FILE_DIRECT=y -CONFIG_SQUASHFS_DECOMP_SINGLE=y -# CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -# CONFIG_SQUASHFS_XATTR is not set -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZ4=y -# CONFIG_SQUASHFS_LZO is not set -# CONFIG_SQUASHFS_XZ is not set -# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -# CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set -# CONFIG_OMFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_PSTORE is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -# CONFIG_NFS_V3_ACL is not set -# CONFIG_NFS_V4 is not set -# CONFIG_NFS_SWAP is not set -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -# CONFIG_NFSD_V4 is not set -CONFIG_GRACE_PERIOD=m -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -# CONFIG_SUNRPC_DEBUG is not set -# CONFIG_CEPH_FS is not set -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_UPCALL is not set -# CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_DEBUG is not set -# CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_SMB2 is not set -# CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_MAC_ROMAN is not set -# CONFIG_NLS_MAC_CELTIC is not set -# CONFIG_NLS_MAC_CENTEURO is not set -# CONFIG_NLS_MAC_CROATIAN is not set -# CONFIG_NLS_MAC_CYRILLIC is not set -# CONFIG_NLS_MAC_GAELIC is not set -# CONFIG_NLS_MAC_GREEK is not set -# CONFIG_NLS_MAC_ICELAND is not set -# CONFIG_NLS_MAC_INUIT is not set -# CONFIG_NLS_MAC_ROMANIAN is not set -# CONFIG_NLS_MAC_TURKISH is not set -CONFIG_NLS_UTF8=y -# CONFIG_DLM is not set - -# -# Kernel hacking -# - -# -# printk and dmesg options -# -# CONFIG_PRINTK_TIME is not set -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 -# CONFIG_BOOT_PRINTK_DELAY is not set -# CONFIG_DYNAMIC_DEBUG is not set - -# -# Compile-time checks and compiler options -# -# CONFIG_DEBUG_INFO is not set -CONFIG_ENABLE_WARN_DEPRECATED=y -CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 -# CONFIG_STRIP_ASM_SYMS is not set -# CONFIG_READABLE_ASM is not set -# CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_PAGE_OWNER is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_SECTION_MISMATCH is not set -CONFIG_SECTION_MISMATCH_WARN_ONLY=y -# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -# CONFIG_MAGIC_SYSRQ is not set -CONFIG_DEBUG_KERNEL=y - -# -# Memory Debugging -# -# CONFIG_PAGE_EXTENSION is not set -# CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -# CONFIG_DEBUG_MEMORY_INIT is not set -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -CONFIG_LOCKUP_DETECTOR=y -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=0 -CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1 -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=5 -CONFIG_SCHED_DEBUG=y -# CONFIG_SCHED_INFO is not set -# CONFIG_SCHEDSTATS is not set -# CONFIG_SCHED_STACK_END_CHECK is not set -# CONFIG_DEBUG_TIMEKEEPING is not set -# CONFIG_TIMER_STATS is not set -# CONFIG_DEBUG_PREEMPT is not set - -# -# Lock Debugging (spinlocks, mutexes, etc...) -# -# CONFIG_DEBUG_RT_MUTEXES is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set -# CONFIG_DEBUG_LOCK_ALLOC is not set -# CONFIG_PROVE_LOCKING is not set -# CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_ATOMIC_SLEEP is not set -# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -# CONFIG_LOCK_TORTURE_TEST is not set -# CONFIG_STACKTRACE is not set -# CONFIG_DEBUG_KOBJECT is not set -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_LIST is not set -# CONFIG_DEBUG_PI_LIST is not set -# CONFIG_DEBUG_SG is not set -# CONFIG_DEBUG_NOTIFIERS is not set -# CONFIG_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -# CONFIG_PROVE_RCU is not set -# CONFIG_SPARSE_RCU_POINTER is not set -# CONFIG_TORTURE_TEST is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -# CONFIG_RCU_TRACE is not set -# CONFIG_RCU_EQS_DEBUG is not set -# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set -# CONFIG_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACING_SUPPORT=y -# CONFIG_FTRACE is not set - -# -# Runtime Testing -# -CONFIG_LKDTM=m -# CONFIG_TEST_LIST_SORT is not set -# CONFIG_BACKTRACE_SELF_TEST is not set -# CONFIG_RBTREE_TEST is not set -# CONFIG_INTERVAL_TREE_TEST is not set -# CONFIG_PERCPU_TEST is not set -# CONFIG_ATOMIC64_SELFTEST is not set -# CONFIG_TEST_HEXDUMP is not set -# CONFIG_TEST_STRING_HELPERS is not set -# CONFIG_TEST_KSTRTOX is not set -# CONFIG_TEST_PRINTF is not set -# CONFIG_TEST_RHASHTABLE is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_TEST_LKM is not set -# CONFIG_TEST_USER_COPY is not set -# CONFIG_TEST_BPF is not set -# CONFIG_TEST_FIRMWARE is not set -# CONFIG_TEST_UDELAY is not set -# CONFIG_MEMTEST is not set -# CONFIG_TEST_STATIC_KEYS is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -# CONFIG_ARM_PTDUMP is not set -CONFIG_STRICT_DEVMEM=y -CONFIG_ARM_UNWIND=y -# CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_LL is not set -CONFIG_DEBUG_IMX_UART_PORT=1 -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -# CONFIG_DEBUG_UART_8250 is not set -# CONFIG_DEBUG_UART_BCM63XX is not set -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -# CONFIG_PID_IN_CONTEXTIDR is not set -# CONFIG_DEBUG_SET_MODULE_RONX is not set -# CONFIG_CORESIGHT is not set - -# -# Security options -# -CONFIG_KEYS=y -# CONFIG_PERSISTENT_KEYRINGS is not set -# CONFIG_BIG_KEYS is not set -CONFIG_ENCRYPTED_KEYS=m -# CONFIG_SECURITY_DMESG_RESTRICT is not set -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -# CONFIG_SECURITY_NETWORK is not set -# CONFIG_SECURITY_PATH is not set -# CONFIG_SECURITY_SMACK is not set -# CONFIG_SECURITY_TOMOYO is not set -# CONFIG_SECURITY_APPARMOR is not set -# CONFIG_SECURITY_YAMA is not set -CONFIG_INTEGRITY=y -# CONFIG_INTEGRITY_SIGNATURE is not set -# CONFIG_IMA is not set -# CONFIG_EVM is not set -CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_DEFAULT_SECURITY="" -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=m -CONFIG_CRYPTO_PCOMP=m -CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_AKCIPHER2=y -# CONFIG_CRYPTO_RSA is not set -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_WORKQUEUE=y -# CONFIG_CRYPTO_CRYPTD is not set -# CONFIG_CRYPTO_MCRYPTD is not set -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -# CONFIG_CRYPTO_CHACHA20POLY1305 is not set -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_ECHAINIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CTR=m -# CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=y -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_PCBC is not set -CONFIG_CRYPTO_XTS=y -# CONFIG_CRYPTO_KEYWRAP is not set - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=m -# CONFIG_CRYPTO_XCBC is not set -# CONFIG_CRYPTO_VMAC is not set - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_CRC32 is not set -# CONFIG_CRYPTO_CRCT10DIF is not set -CONFIG_CRYPTO_GHASH=m -# CONFIG_CRYPTO_POLY1305 is not set -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=y -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -CONFIG_CRYPTO_DES=m -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_CHACHA20 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=m -# CONFIG_CRYPTO_842 is not set -# CONFIG_CRYPTO_LZ4 is not set -# CONFIG_CRYPTO_LZ4HC is not set - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_DRBG_MENU=m -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_HASH=y -CONFIG_CRYPTO_DRBG_CTR=y -CONFIG_CRYPTO_DRBG=m -CONFIG_CRYPTO_JITTERENTROPY=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_USER_API_RNG=m -# CONFIG_CRYPTO_USER_API_AEAD is not set -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -# CONFIG_CRYPTO_DEV_FSL_CAAM is not set -CONFIG_CRYPTO_DEV_SAHARA=y -# CONFIG_CRYPTO_DEV_MXS_DCP is not set -CONFIG_ASYMMETRIC_KEY_TYPE=m -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m -CONFIG_PUBLIC_KEY_ALGO_RSA=m -CONFIG_X509_CERTIFICATE_PARSER=m -CONFIG_PKCS7_MESSAGE_PARSER=m -# CONFIG_PKCS7_TEST_KEY is not set - -# -# Certificates for signature checking -# -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set -# CONFIG_ARM_CRYPTO is not set -# CONFIG_BINARY_PRINTF is not set - -# -# Library routines -# -CONFIG_BITREVERSE=y -CONFIG_HAVE_ARCH_BITREVERSE=y -CONFIG_RATIONAL=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IO=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=y -# CONFIG_CRC_T10DIF is not set -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -# CONFIG_CRC32_SELFTEST is not set -CONFIG_CRC32_SLICEBY8=y -# CONFIG_CRC32_SLICEBY4 is not set -# CONFIG_CRC32_SARWATE is not set -# CONFIG_CRC32_BIT is not set -# CONFIG_CRC7 is not set -# CONFIG_LIBCRC32C is not set -# CONFIG_CRC8 is not set -# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set -# CONFIG_RANDOM32_SELFTEST is not set -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_DECOMPRESS=y -# CONFIG_XZ_DEC is not set -# CONFIG_XZ_DEC_BCJ is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAS_DMA=y -CONFIG_DQL=y -CONFIG_NLATTR=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_CLZ_TAB=y -# CONFIG_CORDIC is not set -# CONFIG_DDR is not set -CONFIG_MPILIB=m -CONFIG_LIBFDT=y -CONFIG_OID_REGISTRY=m -# CONFIG_SG_SPLIT is not set -CONFIG_ARCH_HAS_SG_CHAIN=y -# CONFIG_VIRTUALIZATION is not set diff --git a/inversepath/usbarmory/default.nix b/inversepath/usbarmory/default.nix index 77efd5efea2b..5c329f8286d3 100644 --- a/inversepath/usbarmory/default.nix +++ b/inversepath/usbarmory/default.nix @@ -1,61 +1,46 @@ -{ pkgs, config, lib, ... }: +{ config, lib, pkgs, ... }: + { - nix.binaryCaches = lib.mkForce [ "http://nixos-arm.dezgeg.me/channel" ]; - nix.binaryCachePublicKeys = [ "nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%" ]; - nixpkgs.config.packageOverrides = pkgs: rec { - linuxPackages_usbarmory = pkgs.recurseIntoAttrs ( - pkgs.linuxPackagesFor ( - pkgs.buildLinux rec { - version = "4.4.0"; - src = pkgs.fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz"; - sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"; - }; - configfile = /etc/nixos/customKernel.config; - kernelPatches = [ - { patch = /etc/nixos/usbarmory_dts.patch; - name = "usbarmory_dts"; } - ]; - allowImportFromDerivation = true; - } - ) linuxPackages_usbarmory); - }; boot = { - initrd.kernelModules = []; - kernelParams = [ "console=ttymxc0,115200" ]; + extraModprobeConfig = lib.mkDefault '' + options g_ether use_eem=0 dev_addr=1a:55:89:a2:69:41 host_addr=1a:55:89:a2:69:42 + ''; + kernelModules = [ "ledtrig_heartbeat" "ci_hdrc_imx" "g_ether" ]; - extraModprobeConfig = "options g_ether use_eem=0 dev_addr=1a:55:89:a2:69:41 host_addr=1a:55:89:a2:69:42"; - kernelPackages = pkgs.linuxPackages_usbarmory; + kernelPackages = lib.mkDefault pkgs.linuxPackages_usbarmory; + kernelParams = [ "console=ttymxc0,115200" ]; - loader = { - grub.enable = false; - generic-extlinux-compatible = { - enable = true; - }; - }; + loader.generic-extlinux-compatible.enable = lib.mkDefault true; }; + networking = { - interfaces.usb0.ip4 = [ { address = "172.16.0.2"; prefixLength = 24;} ]; - hostName = "usbarmory"; defaultGateway = "172.16.0.1"; - nameservers = [ "8.8.8.8" ]; - firewall.enable = false; -}; - sound.enable = false; - services = { - nixosManual.enable = false; - openssh.enable = true; - openssh.permitRootLogin = "without-password"; - }; - fileSystems = { - "/boot" = { - device = "/dev/disk/by-label/NIXOS_BOOT"; - fsType = "vfat"; - }; - "/" = { - device = "/dev/disk/by-label/NIXOS_SD"; - fsType = "ext4"; - }; - }; + firewall.enable = lib.mkDefault false; + hostName = "usbarmory"; + interfaces.usb0.ip4 = [ + { address = "172.16.0.2"; prefixLength = 24; } + ]; + + nameservers = [ "8.8.8.8" ]; + }; + + nix = { + binaryCaches = [ "http://nixos-arm.dezgeg.me/channel" ]; + binaryCachePublicKeys = [ "nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%" ]; + }; + + nixpkgs.overlays = [(final: previous: { + linuxPackages_usbarmory = final.recurseIntoAttrs + (final.linuxPackagesFor (import ./kernel.nix { + inherit (final) stdenv buildLinux fetchurl; + })); + })]; + + sound.enable = lib.mkDefault false; + + services = { + openssh.enable = lib.mkDefault true; + openssh.permitRootLogin = lib.mkDefault "without-password"; + }; } diff --git a/inversepath/usbarmory/host.nix b/inversepath/usbarmory/host.nix index 87d4d954d303..42cef490c6f8 100644 --- a/inversepath/usbarmory/host.nix +++ b/inversepath/usbarmory/host.nix @@ -1,34 +1,19 @@ -# -# Module for hosting the USB Armory -# - -{ ... }: - -let - staticDevName = "armory0"; -in +{ dev ? "armory0" }: { - imports = [ ../../lib/hardware-notes.nix ]; + services.udev.extraRules = '' + SUBSYSTEM=="net", ACTION=="add", ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a2", NAME="${staticDevName}" + ''; - hardwareNotes = - [ { title = "USB Armory network interface support"; - text = - '' - rename the Armory USB network interface - - set Armory inteface ip to 10.0.0.2/24 - - enable NAT and forward Armory interface - - add the name 'armory' to /etc/hosts - ''; - } - ]; - - services.udev.extraRules = - ''SUBSYSTEM=="net", ACTION=="add", ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a2", NAME="${staticDevName}"''; - - networking = - { interfaces."${staticDevName}".ip4 = [{ address = "10.0.0.2"; prefixLength = 24; }]; - nat = { enable = true; internalInterfaces = [ staticDevName ]; }; - extraHosts = "10.0.0.1 armory"; + networking = { + interfaces."${staticDevName}".ip4 = [{ + address = "10.0.0.2"; + prefixLength = 24; + }]; + nat = { + enable = true; + internalInterfaces = [ dev ]; }; - + extraHosts = "10.0.0.1 armory"; + }; } diff --git a/inversepath/usbarmory/kernel.config b/inversepath/usbarmory/kernel.config new file mode 100644 index 000000000000..e2fa29737937 --- /dev/null +++ b/inversepath/usbarmory/kernel.config @@ -0,0 +1,995 @@ +CONFIG_ARM=y +CONFIG_ARM_HAS_SG_CHAIN=y +CONFIG_MIGHT_HAVE_PCI=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_GENERIC_BUG=y +CONFIG_PGTABLE_LEVELS=2 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y +CONFIG_DMIID=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_HAVE_KERNEL_LZ4=y +CONFIG_KERNEL_GZIP=y +CONFIG_DEFAULT_HOSTNAME="usbarmory" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_FHANDLE=y +CONFIG_USELIB=y +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_PREEMPT_RCU=y +CONFIG_SRCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_BUILD_BIN2C=y +CONFIG_IKCONFIG=m +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_CGROUPS=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_HAVE_UID16=y +CONFIG_BPF=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_MULTIUSER=y +CONFIG_SYSFS_SYSCALL=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_EMBEDDED=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_COMPAT_BRK=y +CONFIG_SLUB=y +CONFIG_HAVE_OPROFILE=y +CONFIG_JUMP_LABEL=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_CC_STACKPROTECTOR_NONE=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_CMDLINE_PARSER=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_MSDOS_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_EFI_STUB=y +CONFIG_CMDLINE_PARTITION=y +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=m +CONFIG_IOSCHED_CFQ=m +CONFIG_DEFAULT_NOOP=y +CONFIG_DEFAULT_IOSCHED="noop" +CONFIG_ASN1=m +CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_FREEZER=y +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y +CONFIG_ARCH_MXC=y +CONFIG_MXC_TZIC=y +CONFIG_HAVE_IMX_SRC=y +CONFIG_SOC_IMX5=y +CONFIG_SOC_IMX53=y +CONFIG_CPU_V7=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_CACHE_V7=y +CONFIG_CPU_CACHE_VIPT=y +CONFIG_CPU_COPY_V6=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y +CONFIG_ARM_THUMB=y +CONFIG_ARM_VIRT_EXT=y +CONFIG_KUSER_HELPERS=y +CONFIG_OUTER_CACHE=y +CONFIG_OUTER_CACHE_SYNC=y +CONFIG_MIGHT_HAVE_CACHE_L2X0=y +CONFIG_CACHE_L2X0=y +CONFIG_ARM_L1_CACHE_SHIFT_6=y +CONFIG_ARM_L1_CACHE_SHIFT=6 +CONFIG_ARM_DMA_MEM_BUFFERABLE=y +CONFIG_ARM_HEAVY_MB=y +CONFIG_MULTI_IRQ_HANDLER=y +CONFIG_HAVE_SMP=y +CONFIG_VMSPLIT_2G=y +CONFIG_PAGE_OFFSET=0x80000000 +CONFIG_ARCH_NR_GPIO=0 +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +CONFIG_HZ_FIXED=0 +CONFIG_HZ_100=y +CONFIG_HZ=100 +CONFIG_SCHED_HRTICK=y +CONFIG_AEABI=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_CPU_SW_DOMAIN_PAN=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_NO_BOOTMEM=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_NEED_PER_CPU_KM=y +CONFIG_CLEANCACHE=y +CONFIG_ZPOOL=m +CONFIG_ZBUD=m +CONFIG_ZSMALLOC=m +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_ALIGNMENT_TRAP=y +CONFIG_SECCOMP=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +CONFIG_USE_OF=y +CONFIG_ATAGS=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext4 ip=off" +CONFIG_CMDLINE_FROM_BOOTLOADER=y +CONFIG_AUTO_ZRELADDR=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=m +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPUFREQ_DT=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_NEON=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_COREDUMP=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_HIBERNATION=y +CONFIG_PM_STD_PARTITION="" +CONFIG_PM_SLEEP=y +CONFIG_PM=y +CONFIG_PM_OPP=y +CONFIG_PM_CLK=y +CONFIG_CPU_PM=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARM_CPU_SUSPEND=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +CONFIG_XFRM_SUB_POLICY=y +CONFIG_XFRM_MIGRATE=y +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m +CONFIG_NET_FOU_IP_TUNNELS=y +CONFIG_INET_AH=m +CONFIG_INET_ESP=m +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_INET_UDP_DIAG=m +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +CONFIG_DEFAULT_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +CONFIG_IPV6=m +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y +CONFIG_IPV6_OPTIMISTIC_DAD=y +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m +CONFIG_IPV6_VTI=m +CONFIG_IPV6_SIT=m +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=m +CONFIG_IPV6_GRE=m +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +CONFIG_IPV6_MROUTE=y +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=m +CONFIG_NETFILTER_INGRESS=y +CONFIG_NETFILTER_NETLINK=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_LOG_COMMON=m +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_BROADCAST=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_SNMP=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=m +CONFIG_NF_NAT_REDIRECT=m +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_NAT=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NETFILTER_XT_TARGET_TEE=m +CONFIG_NETFILTER_XT_TARGET_TPROXY=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_BPF=m +CONFIG_NETFILTER_XT_MATCH_CGROUP=m +CONFIG_NETFILTER_XT_MATCH_ECN=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HL=m +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_OWNER=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m +CONFIG_NETFILTER_XT_MATCH_TIME=m +CONFIG_NETFILTER_XT_MATCH_U32=m +CONFIG_NF_DEFRAG_IPV4=m +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +CONFIG_NF_DUP_IPV4=m +CONFIG_NF_LOG_ARP=m +CONFIG_NF_LOG_IPV4=m +CONFIG_NF_REJECT_IPV4=m +CONFIG_NF_NAT_IPV4=m +CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_SYNPROXY=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_CONNTRACK_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +CONFIG_NF_NAT_IPV6=m +CONFIG_NF_NAT_MASQUERADE_IPV6=m +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_TARGET_SYNPROXY=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_NAT=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_L2TP=m +CONFIG_STP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_VLAN_8021Q=m +CONFIG_LLC=m +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_RED=m +CONFIG_NET_SCH_NETEM=m +CONFIG_NET_CLS=y +CONFIG_NET_CLS_FW=m +CONFIG_NET_CLS_CGROUP=m +CONFIG_NET_CLS_BPF=m +CONFIG_NET_SCH_FIFO=y +CONFIG_CGROUP_NET_CLASSID=y +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_BPF_JIT=y +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_WEXT_CORE=y +CONFIG_WEXT_PROC=y +CONFIG_CFG80211=m +CONFIG_CFG80211_DEFAULT_PS=y +CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=m +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +CONFIG_HAVE_BPF_JIT=y +CONFIG_UEVENT_HELPER=y +CONFIG_UEVENT_HELPER_PATH="" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +CONFIG_FW_LOADER=m +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_SOC_BUS=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=m +CONFIG_MTD=m +CONFIG_MTD_OF_PARTS=m +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +CONFIG_MTD_M25P80=m +CONFIG_MTD_BLOCK2MTD=m +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_DTC=y +CONFIG_OF=y +CONFIG_OF_FLATTREE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_NET=y +CONFIG_OF_MTD=y +CONFIG_OF_RESERVED_MEM=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +CONFIG_SRAM=y +CONFIG_EEPROM_93CX6=m +CONFIG_SCSI_MOD=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_PROC_FS=y +CONFIG_BLK_DEV_SD=m +CONFIG_SCSI_LOWLEVEL=y +CONFIG_MD=y +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_BUFIO=y +CONFIG_DM_CRYPT=y +CONFIG_DM_VERITY=y +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +CONFIG_DUMMY=m +CONFIG_VXLAN=m +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOL2TP=m +CONFIG_SLHC=m +CONFIG_USB_NET_DRIVERS=m +CONFIG_WLAN=y +CONFIG_RTL8187=m +CONFIG_RT2X00=m +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +CONFIG_RT2800USB=m +CONFIG_RT2800USB_RT33XX=y +CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y +CONFIG_RT2800USB_RT53XX=y +CONFIG_RT2800USB_RT55XX=y +CONFIG_RT2800USB_UNKNOWN=y +CONFIG_RT2800_LIB=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_CRYPTO=y +CONFIG_RT2X00_LIB_LEDS=y +CONFIG_RT2X00_DEBUG=y +CONFIG_RTL_CARDS=m +CONFIG_RTL8192CU=m +CONFIG_RTLWIFI=m +CONFIG_RTLWIFI_USB=m +CONFIG_RTLWIFI_DEBUG=y +CONFIG_RTL8192C_COMMON=m +CONFIG_RTL8XXXU=m +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=m +CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV_PSAUX=y +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_FOCALTECH=y +CONFIG_MOUSE_SERIAL=m +CONFIG_MOUSE_SYNAPTICS_USB=m +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_LIBPS2=y +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_DEVMEM=y +CONFIG_DEVKMEM=y +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_HW_RANDOM=m +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=m +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_IMX=m +CONFIG_SPI=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_MASTER=y +CONFIG_SPI_BITBANG=m +CONFIG_SPI_IMX=m +CONFIG_SPI_SPIDEV=m +CONFIG_PPS=y +CONFIG_PINCTRL=y +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_PINCTRL_IMX=y +CONFIG_PINCTRL_IMX53=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_OF_GPIO=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=y +CONFIG_GPIO_GENERIC_PLATFORM=y +CONFIG_GPIO_MXC=y +CONFIG_POWER_SUPPLY=y +CONFIG_POWER_AVS=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +CONFIG_SOFT_WATCHDOG=m +CONFIG_GPIO_WATCHDOG=m +CONFIG_IMX2_WDT=m +CONFIG_SSB_POSSIBLE=y +CONFIG_BCMA_POSSIBLE=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_LTC3589=m +CONFIG_DUMMY_CONSOLE=y +CONFIG_HID=y +CONFIG_HID_GENERIC=m +CONFIG_USB_HID=m +CONFIG_USB_HIDDEV=y +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +CONFIG_USB_DEFAULT_PERSIST=y +CONFIG_USB_OTG=y +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +CONFIG_USB_EHCI_TT_NEWSCHED=y +CONFIG_USB_STORAGE=m +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_OF=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_DEBUG=y +CONFIG_USB_PHY=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_GADGET=m +CONFIG_USB_GADGET_DEBUG_FS=y +CONFIG_USB_GADGET_VBUS_DRAW=500 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_F_SS_LB=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_G_ACM_MS=m +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +CONFIG_USB_G_MULTI_CDC=y +CONFIG_USB_G_HID=m +CONFIG_MMC=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_BOUNCE=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_IO_ACCESSORS=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_ESDHC_IMX=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=m +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_IMXDI=y +CONFIG_RTC_DRV_MXC=y +CONFIG_DMADEVICES=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y +CONFIG_IMX_SDMA=m +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y +CONFIG_CLKSRC_OF=y +CONFIG_CLKSRC_PROBE=y +CONFIG_CLKSRC_MMIO=y +CONFIG_CLKSRC_IMX_GPT=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_EXTCON=m +CONFIG_IRQCHIP=y +CONFIG_ARCH_HAS_RESET_CONTROLLER=y +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +CONFIG_JBD2=y +CONFIG_FS_MBCACHE=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=m +CONFIG_OVERLAY_FS=y +CONFIG_FAT_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=m +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=m +CONFIG_NTFS_RW=y +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +CONFIG_CONFIGFS_FS=y +CONFIG_MISC_FILESYSTEMS=y +CONFIG_ECRYPT_FS=m +CONFIG_ECRYPT_FS_MESSAGING=y +CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_FILE_DIRECT=y +CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZ4=y +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +CONFIG_GRACE_PERIOD=m +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_CIFS=m +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_UTF8=y +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_DEBUG_FS=y +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_DEBUG_KERNEL=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_LOCKUP_DETECTOR=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=0 +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1 +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=5 +CONFIG_SCHED_DEBUG=y +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACING_SUPPORT=y +CONFIG_LKDTM=m +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_STRICT_DEVMEM=y +CONFIG_ARM_UNWIND=y +CONFIG_DEBUG_IMX_UART_PORT=1 +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" +CONFIG_KEYS=y +CONFIG_ENCRYPTED_KEYS=m +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y +CONFIG_INTEGRITY=y +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=m +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=m +CONFIG_CRYPTO_PCOMP=m +CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_ECHAINIV=m +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_XTS=y +CONFIG_CRYPTO_CMAC=m +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_GHASH=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=m +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_DRBG_MENU=m +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_HASH=y +CONFIG_CRYPTO_DRBG_CTR=y +CONFIG_CRYPTO_DRBG=m +CONFIG_CRYPTO_JITTERENTROPY=m +CONFIG_CRYPTO_USER_API=m +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_HASH_INFO=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_SAHARA=y +CONFIG_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m +CONFIG_PKCS7_MESSAGE_PARSER=m +CONFIG_BITREVERSE=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_RATIONAL=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=y +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC32_SLICEBY8=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_LZ4_DECOMPRESS=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_DQL=y +CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_CLZ_TAB=y +CONFIG_MPILIB=m +CONFIG_LIBFDT=y +CONFIG_OID_REGISTRY=m +CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/inversepath/usbarmory/kernel.nix b/inversepath/usbarmory/kernel.nix new file mode 100644 index 000000000000..4cf6fd7fdb8a --- /dev/null +++ b/inversepath/usbarmory/kernel.nix @@ -0,0 +1,20 @@ +{ stdenv, buildLinux, fetchurl }: + +buildLinux { + inherit stdenv; + version = "4.4.0"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz"; + sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"; + }; + + configfile = ./kernel.config; + + kernelPatches = [{ + patch = ./usbarmory-dts.patch; + name = "usbarmory-dts"; + }]; + + allowImportFromDerivation = true; +} diff --git a/inversepath/usbarmory/usbarmory_dts.patch b/inversepath/usbarmory/usbarmory-dts.patch similarity index 100% rename from inversepath/usbarmory/usbarmory_dts.patch rename to inversepath/usbarmory/usbarmory-dts.patch diff --git a/tests/eval-test.sh b/tests/eval-test.sh index 72d634199d88..00970b775636 100755 --- a/tests/eval-test.sh +++ b/tests/eval-test.sh @@ -2,16 +2,7 @@ cd $(dirname $0)/.. -skip_paths=( - ./inversepath/usbarmory/* - ./tests/* -) - -find=(find . -name *.nix) - -for path in ${skip_paths[@]}; do - find+=(-not -path $path) -done +find=(find . -name default.nix) for profile in `${find[@]}`; do echo evaluating $profile >&2 From 4d498aff1a147f06d71a8e96d17bbba9df5ae926 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 18:00:51 +0000 Subject: [PATCH 091/624] tests: move to _tests --- {tests => _tests}/eval-test.nix | 0 {tests => _tests}/eval-test.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename {tests => _tests}/eval-test.nix (100%) rename {tests => _tests}/eval-test.sh (86%) diff --git a/tests/eval-test.nix b/_tests/eval-test.nix similarity index 100% rename from tests/eval-test.nix rename to _tests/eval-test.nix diff --git a/tests/eval-test.sh b/_tests/eval-test.sh similarity index 86% rename from tests/eval-test.sh rename to _tests/eval-test.sh index 00970b775636..311208e0d459 100755 --- a/tests/eval-test.sh +++ b/_tests/eval-test.sh @@ -8,7 +8,7 @@ for profile in `${find[@]}`; do echo evaluating $profile >&2 nixos-rebuild \ - -I nixos-config=tests/eval-test.nix \ + -I nixos-config=_tests/eval-test.nix \ -I nixos-hardware-profile=$profile \ dry-build From 38fd4c1541145385ab707c174cc482ac61b1765e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 19:18:27 +0000 Subject: [PATCH 092/624] README: seperate -> separate --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index 8f8c0eea5e84..1a632ac0a096 100644 --- a/README.org +++ b/README.org @@ -33,7 +33,7 @@ For example, to enable ThinkPad X220 profile, your ~imports~ should look like: Profiles should favor usability and stability, so performance hacks should be activated by an additional NixOS option or conservative and performance configs -can be declared in seperate profiles. +can be declared in separate profiles. Because profiles can only be tested with the appropriate hardware, quality assurance is up to *you*. From 8abb6374c10de9e174722733faa7c3e4f40a9c7f Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 19:34:39 +0000 Subject: [PATCH 093/624] README: extract CONTRIBUTING, clean up --- CONTRIBUTING.org | 6 ++++++ README.org | 33 +++++++++++++-------------------- 2 files changed, 19 insertions(+), 20 deletions(-) create mode 100644 CONTRIBUTING.org diff --git a/CONTRIBUTING.org b/CONTRIBUTING.org new file mode 100644 index 000000000000..fc6ed8a8dd4a --- /dev/null +++ b/CONTRIBUTING.org @@ -0,0 +1,6 @@ +Profiles should favor usability and stability, so performance hacks should be +activated by an additional NixOS option or conservative and performance configs +can be declared in separate profiles. + +Because profiles can only be tested with the appropriate hardware, quality +assurance is up to *you*. diff --git a/README.org b/README.org index 1a632ac0a096..f08f03228fa5 100644 --- a/README.org +++ b/README.org @@ -1,13 +1,21 @@ NixOS profiles covering hardware quirks. -Add a new channel: +** Setup + +Add and update ~nixos-hardware~ channel: : $ sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware : $ sudo nix-channel --update nixos-hardware -Then add an appropriate profile path to ~imports~ in -~/etc/nixos/configuration.nix~. Currently available profiles: +Then import an appropriate profile path from the table below. For example, to +enable ThinkPad X220 profile, your ~imports~ in ~/etc/nixos/configuration.nix~ +should look like: + : imports = [ ./hardware-configuration.nix ]; + +** Profiles + +|---------------------------+--------------------------------------------| | Model | Path | |---------------------------+--------------------------------------------| | Acer Aspire 4810T | ~~ | @@ -15,6 +23,7 @@ Then add an appropriate profile path to ~imports~ in | Apple MacBook Pro 10,1 | ~~ | | Apple MacBook Pro 12,1 | ~~ | | Dell XPS 15 9550 | ~~ | +| Inverse Path USB armory | ~~ | | Lenovo IdeaPad Z510 | ~~ | | Lenovo ThinkPad T410 | ~~ | | Lenovo ThinkPad T440p | ~~ | @@ -26,20 +35,4 @@ Then add an appropriate profile path to ~imports~ in | Samsung Series 9 NP900X3C | ~~ | | Supermicro A1SRi-2758F | ~~ | | Supermicro X10SLL-F | ~~ | - -For example, to enable ThinkPad X220 profile, your ~imports~ should look like: - - : imports = [ ./hardware-configuration.nix ]; - -Profiles should favor usability and stability, so performance hacks should be -activated by an additional NixOS option or conservative and performance configs -can be declared in separate profiles. - -Because profiles can only be tested with the appropriate hardware, quality -assurance is up to *you*. - -** Simple tips and tricks - -*** Disable PC speaker - - : boot.blacklistedKernelModules = [ "pcspkr" ]; +|---------------------------+--------------------------------------------| From b63e0eb372b00d4cb5ca552ae9583bdb593f07dd Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 22:21:53 +0000 Subject: [PATCH 094/624] Revert "tests: move to _tests" This reverts commit 4d498aff1a147f06d71a8e96d17bbba9df5ae926. --- {_tests => tests}/eval-test.nix | 0 {_tests => tests}/eval-test.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename {_tests => tests}/eval-test.nix (100%) rename {_tests => tests}/eval-test.sh (86%) diff --git a/_tests/eval-test.nix b/tests/eval-test.nix similarity index 100% rename from _tests/eval-test.nix rename to tests/eval-test.nix diff --git a/_tests/eval-test.sh b/tests/eval-test.sh similarity index 86% rename from _tests/eval-test.sh rename to tests/eval-test.sh index 311208e0d459..00970b775636 100755 --- a/_tests/eval-test.sh +++ b/tests/eval-test.sh @@ -8,7 +8,7 @@ for profile in `${find[@]}`; do echo evaluating $profile >&2 nixos-rebuild \ - -I nixos-config=_tests/eval-test.nix \ + -I nixos-config=tests/eval-test.nix \ -I nixos-hardware-profile=$profile \ dry-build From 5407ba7a5242062edeaf3dbcd42d533b9ff96023 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 23:21:05 +0000 Subject: [PATCH 095/624] treewide: abstract away common configs into common/ --- acer/aspire/4810t/default.nix | 13 ++++++------- airis/n990/default.nix | 7 +++---- apple/macbook-pro/10-1/default.nix | 9 ++++++--- apple/macbook-pro/12-1/default.nix | 3 ++- apple/macbook-pro/default.nix | 7 +++++++ common/README.org | 2 ++ common/cpu/amd/default.nix | 3 +++ common/cpu/intel/default.nix | 4 ++++ common/pc/default.nix | 5 +++++ common/pc/hdd/default.nix | 7 +++++++ common/pc/laptop/default.nix | 11 +++++++++++ common/pc/laptop/hdd/default.nix | 8 ++++++++ common/pc/laptop/ssd | 1 + common/pc/ssd/default.nix | 7 +++++++ dell/xps/15-9550/default.nix | 8 ++++++-- lenovo/ideapad/default.nix | 3 +++ lenovo/ideapad/z510/default.nix | 5 ++++- lenovo/thinkpad/default.nix | 5 +++-- lenovo/thinkpad/t410/default.nix | 10 +++++----- lenovo/thinkpad/t440p/default.nix | 7 ++++--- lenovo/thinkpad/t460s/default.nix | 9 +++++---- lenovo/thinkpad/x140e/default.nix | 5 ++++- lenovo/thinkpad/x220/default.nix | 11 ++++++----- 23 files changed, 112 insertions(+), 38 deletions(-) create mode 100644 apple/macbook-pro/default.nix create mode 100644 common/README.org create mode 100644 common/cpu/amd/default.nix create mode 100644 common/cpu/intel/default.nix create mode 100644 common/pc/default.nix create mode 100644 common/pc/hdd/default.nix create mode 100644 common/pc/laptop/default.nix create mode 100644 common/pc/laptop/hdd/default.nix create mode 120000 common/pc/laptop/ssd create mode 100644 common/pc/ssd/default.nix create mode 100644 lenovo/ideapad/default.nix diff --git a/acer/aspire/4810t/default.nix b/acer/aspire/4810t/default.nix index ed0e923a85c4..f21d630478de 100644 --- a/acer/aspire/4810t/default.nix +++ b/acer/aspire/4810t/default.nix @@ -1,6 +1,11 @@ { lib, ... }: { + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop + ]; + boot = { initrd.kernelModules = [ "ata_piix" ]; kernelParams = [ @@ -8,6 +13,7 @@ "acpi=on" "vga=0x317" "video=vesafb:ywrap" + # Important, to disable Kernel Mode Setting for the graphics card # This will allow backlight regulation "nomodeset" @@ -17,13 +23,6 @@ hardware.opengl.driSupport = false; services.xserver = { - enable = lib.mkDefault true; defaultDepth = lib.mkDefault 24; - videoDrivers = [ "intel" ]; - autorun = lib.mkDefault true; - synaptics = { - enable = lib.mkDefault true; - dev = "/dev/input/event8"; - }; }; } diff --git a/airis/n990/default.nix b/airis/n990/default.nix index 7c45d2a2b3dc..ae06813131a8 100644 --- a/airis/n990/default.nix +++ b/airis/n990/default.nix @@ -1,6 +1,8 @@ { lib, pkgs, ... }: { + imports = [ ../../common/pc/laptop ]; + boot = { initrd.kernelModules = [ "pata_via" ]; @@ -15,8 +17,5 @@ hardware.firmware = with pkgs; [ intel2200BGFirmware ]; - services.xserver = { - synaptics.enable = lib.mkDefault true; - videoDrivers = [ "unichrome" ]; - }; + services.xserver.videoDrivers = [ "openchrome" ]; } diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix index 0fa8a2f4bc2e..06e7486fb75f 100644 --- a/apple/macbook-pro/10-1/default.nix +++ b/apple/macbook-pro/10-1/default.nix @@ -1,16 +1,19 @@ { lib, pkgs, ... }: { - imports = [ ../../. ]; + imports = [ + ../. + ../../../common/pc/laptop/ssd + ]; + # TODO: boot loader boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + # TODO: drop hardware.opengl.driSupport32Bit = true; services.xserver = { - libinput.enable = lib.mkDefault true; - # TODO: we should not enable unfree drivers # when there is an alternative (i.e. nouveau) videoDrivers = [ "nvidia" ]; diff --git a/apple/macbook-pro/12-1/default.nix b/apple/macbook-pro/12-1/default.nix index 63c36db6472a..02c6f328cf5a 100644 --- a/apple/macbook-pro/12-1/default.nix +++ b/apple/macbook-pro/12-1/default.nix @@ -2,7 +2,8 @@ { imports = [ - ../../. + ../. + ../../../common/pc/laptop/ssd ]; diff --git a/apple/macbook-pro/default.nix b/apple/macbook-pro/default.nix new file mode 100644 index 000000000000..4ced65a382e0 --- /dev/null +++ b/apple/macbook-pro/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ../. + ../../common/cpu/intel + ../../common/pc/laptop + ]; +} diff --git a/common/README.org b/common/README.org new file mode 100644 index 000000000000..3239e2f23b94 --- /dev/null +++ b/common/README.org @@ -0,0 +1,2 @@ +*NB!* This subtree is subject to change. Please don't import from here directly +for now, unless you're OK that things might break at any point in time. diff --git a/common/cpu/amd/default.nix b/common/cpu/amd/default.nix new file mode 100644 index 000000000000..a8a36b2c91ba --- /dev/null +++ b/common/cpu/amd/default.nix @@ -0,0 +1,3 @@ +{ + hardware.cpu.amd.updateMicrocode = true; +} diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix new file mode 100644 index 000000000000..e3ce9193050e --- /dev/null +++ b/common/cpu/intel/default.nix @@ -0,0 +1,4 @@ +{ + hardware.cpu.intel.updateMicrocode = true; + services.xserver.videoDrivers = [ "intel" ]; +} diff --git a/common/pc/default.nix b/common/pc/default.nix new file mode 100644 index 000000000000..0b498ff1d20e --- /dev/null +++ b/common/pc/default.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + services.xserver.libinput.enable = lib.mkDefault true; +} diff --git a/common/pc/hdd/default.nix b/common/pc/hdd/default.nix new file mode 100644 index 000000000000..8cc5ada0deb9 --- /dev/null +++ b/common/pc/hdd/default.nix @@ -0,0 +1,7 @@ +{ lib, ... }: + +{ + boot.kernel.sysctl = { + "vm.swappiness" = lib.mkDefault 10; + }; +} diff --git a/common/pc/laptop/default.nix b/common/pc/laptop/default.nix new file mode 100644 index 000000000000..305c160e2094 --- /dev/null +++ b/common/pc/laptop/default.nix @@ -0,0 +1,11 @@ +{ lib, ... }: + +{ + imports = [ ../. ]; + + boot.kernel.sysctl = { + "vm.laptop_mode" = lib.mkDefault 5; + }; + + services.tlp.enable = lib.mkDefault true; +} diff --git a/common/pc/laptop/hdd/default.nix b/common/pc/laptop/hdd/default.nix new file mode 100644 index 000000000000..63f29d458c29 --- /dev/null +++ b/common/pc/laptop/hdd/default.nix @@ -0,0 +1,8 @@ +{ lib, ... }: + +{ + imports = [ ../../hdd ]; + + # Hard disk protection if the laptop falls: + services.hdapsd.enable = lib.mkDefault true; +} diff --git a/common/pc/laptop/ssd b/common/pc/laptop/ssd new file mode 120000 index 000000000000..e313834a4372 --- /dev/null +++ b/common/pc/laptop/ssd @@ -0,0 +1 @@ +../ssd \ No newline at end of file diff --git a/common/pc/ssd/default.nix b/common/pc/ssd/default.nix new file mode 100644 index 000000000000..af0b49568cd1 --- /dev/null +++ b/common/pc/ssd/default.nix @@ -0,0 +1,7 @@ +{ lib, ... }: + +{ + boot.kernel.sysctl = { + "vm.swappiness" = lib.mkDefault 1; + }; +} diff --git a/dell/xps/15-9550/default.nix b/dell/xps/15-9550/default.nix index e0bb70058abd..90cfc6e2936a 100644 --- a/dell/xps/15-9550/default.nix +++ b/dell/xps/15-9550/default.nix @@ -1,11 +1,15 @@ { lib, ... }: { + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop + ]; + + # TODO: boot loader boot.loader.systemd-boot.enable = lib.mkDefault true; boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; # To just use Intel integrated graphics with Intel's open source driver # hardware.nvidiaOptimus.disable = true; - - services.xserver.libinput.enable = lib.mkDefault true; } diff --git a/lenovo/ideapad/default.nix b/lenovo/ideapad/default.nix new file mode 100644 index 000000000000..d774ba3793af --- /dev/null +++ b/lenovo/ideapad/default.nix @@ -0,0 +1,3 @@ +{ + imports = [ ../../common/pc/laptop ]; +} diff --git a/lenovo/ideapad/z510/default.nix b/lenovo/ideapad/z510/default.nix index 4c8edf38f215..83f656806854 100644 --- a/lenovo/ideapad/z510/default.nix +++ b/lenovo/ideapad/z510/default.nix @@ -1,7 +1,10 @@ { lib, ... }: { - hardware.cpu.intel.updateMicrocode = lib.mkDefault true; + imports = [ + ../. + ../../../common/cpu/intel + ]; # https://github.com/NixOS/nixpkgs/issues/18356 boot.blacklistedKernelModules = [ "nouveau" ]; diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix index ae9804b67181..52d09bcf9df0 100644 --- a/lenovo/thinkpad/default.nix +++ b/lenovo/thinkpad/default.nix @@ -1,9 +1,10 @@ { lib, pkgs, ... }: { + imports = [ ../../common/pc/laptop ]; + hardware.trackpoint.enable = lib.mkDefault true; - services.tlp.enable = lib.mkDefault true; - services.xserver.libinput.enable = lib.mkDefault true; + services.thinkfan.enable = lib.mkDefault true; # Fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) # services.fprintd.enable = true; diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index 568d9e65c573..737e91fe0c33 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -1,7 +1,11 @@ { config, lib, pkgs, ... }: { - imports = [ ../. ../tp-smapi.nix ]; + imports = [ + ../. + ../tp-smapi.nix + ../../../common/cpu/intel + ]; boot = { kernelParams = [ @@ -27,8 +31,4 @@ "sierra_net" "cdc_mbim" "cdc_ncm" "btusb" ]; }; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault true; - - services.xserver.videoDrivers = [ "intel" ]; } diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index ddf6bd8ae9d3..464c874dc60b 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -1,7 +1,10 @@ { config, lib, pkgs, ... }: { - imports = [ ../. ]; + imports = [ + ../. + ../../../common/cpu/intel + ]; boot = { extraModprobeConfig = lib.mkDefault '' @@ -9,6 +12,4 @@ ''; kernelModules = [ "tpm-rng" ]; }; - - services.xserver.videoDrivers = [ "intel" ]; } diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index ffe6ec33c00c..41558a35b7f6 100644 --- a/lenovo/thinkpad/t460s/default.nix +++ b/lenovo/thinkpad/t460s/default.nix @@ -1,11 +1,12 @@ { config, lib, pkgs, ... }: { - imports = [ ../. ]; + imports = [ + ../../../common/cpu/intel + ../. + ]; - # Use the gummiboot efi boot loader. (From default generated configuration.nix) + # TODO: boot loader boot.loader.systemd-boot.enable = lib.mkDefault true; boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; - - services.xserver.videoDrivers = [ "intel" ]; } diff --git a/lenovo/thinkpad/x140e/default.nix b/lenovo/thinkpad/x140e/default.nix index 81f67addcd85..c03410e936e2 100644 --- a/lenovo/thinkpad/x140e/default.nix +++ b/lenovo/thinkpad/x140e/default.nix @@ -1,7 +1,10 @@ { config, lib, pkgs, ... }: { - imports = [ ../. ]; + imports = [ + ../. + ../../../common/cpu/amd + ]; boot.extraModprobeConfig = lib.mkDefault '' options snd_hda_intel enable=0,1 diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index efa67fc6a821..e821f966fa51 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -1,9 +1,10 @@ { config, lib, pkgs, ... }: { - imports = [ ../. ../tp-smapi.nix ]; - - # hard disk protection if the laptop falls - services.hdapsd.enable = lib.mkDefault true; - services.xserver.videoDrivers = [ "intel" ]; + imports = [ + ../. + ../../../common/cpu/intel + ../../../common/pc/laptop/hdd + ../tp-smapi.nix + ]; } From 1c54b711e500a63350bff3b60e35e221bc9433ab Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 23:23:39 +0000 Subject: [PATCH 096/624] common: drop notice I didn't mean to commit that. I'm pretty sure common/ is a good name, and basic layout is unlikely to change. --- common/README.org | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 common/README.org diff --git a/common/README.org b/common/README.org deleted file mode 100644 index 3239e2f23b94..000000000000 --- a/common/README.org +++ /dev/null @@ -1,2 +0,0 @@ -*NB!* This subtree is subject to change. Please don't import from here directly -for now, unless you're OK that things might break at any point in time. From aa70bfe955c6d08ca6dacadb46a7063c9ef38de1 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 24 Dec 2017 23:44:25 +0000 Subject: [PATCH 097/624] asus/m60j-jx041v: drop (README only) It's not useful and links are broken. --- asus/m60j-jx041v/README.wiki | 98 ------------------------------------ 1 file changed, 98 deletions(-) delete mode 100644 asus/m60j-jx041v/README.wiki diff --git a/asus/m60j-jx041v/README.wiki b/asus/m60j-jx041v/README.wiki deleted file mode 100644 index 51a0cd12edd8..000000000000 --- a/asus/m60j-jx041v/README.wiki +++ /dev/null @@ -1,98 +0,0 @@ -This page is a work in progress. - -= Overview = - -Most of the features seem to be working with Linux 2.6.32. - -== Hardware == - -* Ethernet: Attansic Technology Corp. Device 1063 (rev c0) -* Wireless: Intel Corporation Wifi Link 100 Series -* Bluetooth: -* Sound: Realtek ALC269 -* Video: nVidia GeForce GT 240M -* Video RAM: 1GB DDR3 -* CPU: Core i7 720 QM (4 core, 2 threads per core) -* RAM: 4 GB -* HDD: 2* 320 GB, 5200 rpm. -* Fingerprint Sensor. - -== Support == - -* Ethernet: Yes. -* Wireless: Yes. -* Bluetooth: Yes. -* Sound: Yes. -* Video: Yes. (dual screen working fine) -* Software Raid: Yes. -* Keyboard: some Function (Fn) keys are not recognized / mapped correctly. -* Fingerprint Sensor: Not tested. (listed by lshal) - -== Tests == - -* Video: -** Maximal Resolution: 1366x768 -** glxgears: 1859.8 FPS @ 1366x768 - -= Configuration = - -You can see the configuration file specific to this computer at [https://svn.nixos.org/repos/nix/configurations/trunk/computer/asus/m60j/jx041v.nix configurations/computer/asus/m60j/jx041v.nix] - -= Problems & Solutions = - -== No Ethernet == - -This problem appear if you are using an old kernel. - -
[root@nixos:]# lspci -v | sed -n '/Ethernet/ { :loop p; n; s/^$//; T loop; q}'
-07:00.0 Ethernet controller: Attansic Technology Corp. Device 1063 (rev c0)
-        ...
-        Kernel driver in use: atl1c
-        Kernel modules: atl1c
-
- -While searching on the web you find that this ethernet device need the kernel module atl1e instead of atl1c. The following sources explain how to unpack & compile & install such module on usual distributions. As we are on a NixOS, things are a bit different. - -To follow the instruction you need to find a way to copy the module sources of AR81Family-linux-v1.0.0.10.tar.gz ([http://www.backtrack.it/~emgent/hackstuff/Attansic/ http://www.backtrack.it/~emgent/hackstuff/Attansic/]) on the targeted device. - -
-# avoid messing up your term
-[root@nixos:]# initctl stop dhclient
-# add dependencies in the environment
-[root@nixos:]# nix-env -i gcc gnumake
-[root@nixos:]# ln -s /nix/store/*-linux-$(uname -r)/lib /lib
-# unpack & compile
-[root@nixos:]# mkdir /tmp/AR81Family-linux
-[root@nixos:]# cp .../AR81Family-linux-v1.0.0.10.tar.gz .
-[root@nixos:]# yes y | tar xzf AR81Family-linux-v1.0.0.10.tar.gz
-[root@nixos:]# cd src
-[root@nixos:]# make
-# Replace the current module
-[root@nixos:]# rmmod atl1c
-[root@nixos:]# modprobe /tmp/AR81Family-linux/src/atl1e.ko
-# start fetching an IP address.
-[root@nixos:]# initctl start dhclient
-
- -At the end, you end up with a working interface and the following result: - -
[root@nixos:]# lspci -v | sed -n '/Ethernet/ { :loop p; n; s/^$//; T loop; q}'
-07:00.0 Ethernet controller: Attansic Technology Corp. Device 1063 (rev c0)
-        ...
-        Kernel driver in use: atheros_eth
-        Kernel modules: atl1c
-
- -Many reference to AR81Family-linux-v1.0.1.0.tar.gz can be found on the web, but the manufacturer links are broken. - -Sources: -* [http://platonic.techfiz.info/2009/10/25/ethernet-controller-attansic-technology-corp-device-1063-on-ubuntu/ http://platonic.techfiz.info/2009/10/25/ethernet-controller-attansic-technology-corp-device-1063-on-ubuntu/] - -== Grub == - -* Changing the boot sequence in the BIOS is changing the apparent mapping of hard-drives. Thus hd0 and hd1 are inverted in GRUB 2. -* The MBR is not restored by the recovery CDs. - -[[Category:Installation]] -[[Category:Hardware]] -[[Category:Laptops]] From db483616db2f283fd422b02520b1ba2a0cedba88 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 01:24:54 +0000 Subject: [PATCH 098/624] apple/macbook-air/6: init --- apple/macbook-air/6/default.nix | 14 ++++++++++++++ apple/macbook-air/default.nix | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 apple/macbook-air/6/default.nix create mode 100644 apple/macbook-air/default.nix diff --git a/apple/macbook-air/6/default.nix b/apple/macbook-air/6/default.nix new file mode 100644 index 000000000000..9588b3061382 --- /dev/null +++ b/apple/macbook-air/6/default.nix @@ -0,0 +1,14 @@ +{ config, lib, ... }: + +{ + imports = [ ../. ]; + + boot = { + extraModulePackages = with config.boot.kernelPackages; [ mba6x_bl ]; + kernelModules = [ "mba6x_bl" ]; + }; + + services.xserver.deviceSection = lib.mkDefault '' + Option "Backlight" "mba6x_backlight" + ''; +} diff --git a/apple/macbook-air/default.nix b/apple/macbook-air/default.nix new file mode 100644 index 000000000000..ea15175d0319 --- /dev/null +++ b/apple/macbook-air/default.nix @@ -0,0 +1,8 @@ +{ + imports = [ + ../. + ../../common/cpu/intel + ../../common/pc/laptop + ../../common/pc/laptop/ssd + ]; +} From 5a1a527f1600d5132d255423cd2238e33c32ff5b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 01:28:02 +0000 Subject: [PATCH 099/624] apple: enable facetimehd if allowUnfree = true --- apple/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apple/default.nix b/apple/default.nix index 6fa8e5de705f..903588360eca 100644 --- a/apple/default.nix +++ b/apple/default.nix @@ -1,5 +1,6 @@ -{ lib, ... }: +{ config, lib, ... }: { + hardware.facetimehd.enable = lib.mkDefault (config.nixpkgs.config.allowUnfree or false); services.mbpfan.enable = lib.mkDefault true; } From 9b3e42be63b5f4553ca7747643447ba6dd4e50ad Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 01:51:02 +0000 Subject: [PATCH 100/624] apple: wrap hardware.facetimehd option --- apple/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apple/default.nix b/apple/default.nix index 903588360eca..723732228a9e 100644 --- a/apple/default.nix +++ b/apple/default.nix @@ -1,6 +1,8 @@ { config, lib, ... }: { - hardware.facetimehd.enable = lib.mkDefault (config.nixpkgs.config.allowUnfree or false); + hardware.facetimehd.enable = lib.mkDefault + (config.nixpkgs.config.allowUnfree or false); + services.mbpfan.enable = lib.mkDefault true; } From a5df61571cbe313861705a5573e9a6e8481cd224 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 01:51:51 +0000 Subject: [PATCH 101/624] raspberry-pi/2: format README --- raspberry-pi/2/{README.txt => README.org} | 24 +++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) rename raspberry-pi/2/{README.txt => README.org} (55%) diff --git a/raspberry-pi/2/README.txt b/raspberry-pi/2/README.org similarity index 55% rename from raspberry-pi/2/README.txt rename to raspberry-pi/2/README.org index 49f661fae7af..842919b1acf4 100644 --- a/raspberry-pi/2/README.txt +++ b/raspberry-pi/2/README.org @@ -1,19 +1,23 @@ -imported from https://nixos.org/wiki/Raspberry_Pi_2 ** +** Status -# Status -The code in master as of June 2015 should be able to prepare a bootable NixOS for Raspberry PI 2. +The code in master as of June 2015 should be able to prepare a bootable NixOS +for Raspberry PI 2. There are still some drawbacks: -NixOS does not provide a /boot/config.txt (the FAT32 partition). -Making NixOS work in the Raspberry PI 2 is mainly the result of the recent work of ambro718, Dezgeg and viric (#nixos@irc.freenode.net). +NixOS does not provide a /boot/config.txt (the FAT32 partition). Making NixOS +work in the Raspberry PI 2 is mainly the result of the recent work of ambro718, +Dezgeg and viric (#nixos@irc.freenode.net). + +** Download + +If you want to test, you can flash this 4GB SD image (DOS partition table + +fat32 + ext4 rootfs): -# Download -If you want to test, you can flash this 4GB SD image (DOS partition table + fat32 + ext4 rootfs): magnet:?xt=urn:btih:0def3f6acb3bceddb22cb24098f58e40e2853ec2&dn=rpi2-nixos-4b09501f2-img.xz&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80 Then you should be able to nixos-rebuild any configuration.nix changes. -The image is the result of a "nixos-install" alone. No root password has been set, and it does not include a nixpkgs checkout or channel. - -In fact I (viric) created the FS into a NBD, not a real SD, to create this image. +The image is the result of a "nixos-install" alone. No root password has been +set, and it does not include a nixpkgs checkout or channel. In fact I (viric) +created the FS into a NBD, not a real SD, to create this image. From e228c7827b5ac2b08f07433aa8fbc8f2c41e85a5 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 04:30:32 +0000 Subject: [PATCH 102/624] apple: add hid_apple.iso_layout=0 kernel param In my experience, this makes keyboard behavior match letters printed on it both on EU and US keyboards. --- apple/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apple/default.nix b/apple/default.nix index 723732228a9e..a2ee26230aaa 100644 --- a/apple/default.nix +++ b/apple/default.nix @@ -1,6 +1,10 @@ { config, lib, ... }: { + boot.kernelParams = [ + "hid_apple.iso_layout=0" + ]; + hardware.facetimehd.enable = lib.mkDefault (config.nixpkgs.config.allowUnfree or false); From 88bd1266a78d88bea8efaec6ed6e2ba714f0872b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 04:32:30 +0000 Subject: [PATCH 103/624] apple/macbook-air/4: add --- apple/macbook-air/4/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 apple/macbook-air/4/default.nix diff --git a/apple/macbook-air/4/default.nix b/apple/macbook-air/4/default.nix new file mode 100644 index 000000000000..c6ed7e67ad66 --- /dev/null +++ b/apple/macbook-air/4/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ ../. ]; + + boot.kernelParams = [ + "acpi_backlight=vendor" + ]; +} From f9a1ac62972dc755c70a8cf2c8b28989d6832369 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 04:46:15 +0000 Subject: [PATCH 104/624] common/pc/laptop: disable cpuFreqGovernor --- common/pc/laptop/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/pc/laptop/default.nix b/common/pc/laptop/default.nix index 305c160e2094..5da1e60a449f 100644 --- a/common/pc/laptop/default.nix +++ b/common/pc/laptop/default.nix @@ -7,5 +7,10 @@ "vm.laptop_mode" = lib.mkDefault 5; }; + # TODO: fix in NixOS/nixpkgs + # Disable governor set in hardware-configuration.nix, + # required when services.tlp.enable is true: + powerManagement.cpuFreqGovernor = lib.mkForce null; + services.tlp.enable = lib.mkDefault true; } From 2227f2c67a3c3b7b31c9133acf5ddfdf2cd60ba5 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 04:49:53 +0000 Subject: [PATCH 105/624] apple/macbook-air/4: resolve tearing --- apple/macbook-air/4/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apple/macbook-air/4/default.nix b/apple/macbook-air/4/default.nix index c6ed7e67ad66..146289de41e1 100644 --- a/apple/macbook-air/4/default.nix +++ b/apple/macbook-air/4/default.nix @@ -1,7 +1,13 @@ +{ lib, ... }: + { imports = [ ../. ]; boot.kernelParams = [ "acpi_backlight=vendor" ]; + + services.xserver.deviceSection = lib.mkDefault '' + Option "TearFree" "true" + ''; } From a2c6590c3d07aaeda835bf2e23964a4f116e9407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 25 Dec 2017 14:15:16 +0100 Subject: [PATCH 106/624] add lenovo x250 (#38) Basically a meta profile that combines thinkpad + intel. --- README.org | 1 + lenovo/thinkpad/x250/default.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 lenovo/thinkpad/x250/default.nix diff --git a/README.org b/README.org index f08f03228fa5..b812182e8502 100644 --- a/README.org +++ b/README.org @@ -30,6 +30,7 @@ should look like: | Lenovo ThinkPad T460s | ~~ | | Lenovo ThinkPad X140e | ~~ | | Lenovo ThinkPad X220 | ~~ | +| Lenovo ThinkPad X250 | ~~ | | Microsoft Surface Pro 3 | ~~ | | Raspberry Pi 2 | ~~ | | Samsung Series 9 NP900X3C | ~~ | diff --git a/lenovo/thinkpad/x250/default.nix b/lenovo/thinkpad/x250/default.nix new file mode 100644 index 000000000000..36a1a8e6036c --- /dev/null +++ b/lenovo/thinkpad/x250/default.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../. + ../../../common/cpu/intel + ]; + + # Thinkfan is enabled by thinkpad profile. + # However it requires to set a different `sensor` for this hardware, since there is no /proc/acpi/ibm/thermal + # Regulation also works fine without thinkfan daemon though. + services.thinkfan.enable = lib.mkOverride 900 false; + + # maintainers: Mic92 +} From e6091de6911e821a106fd97c3ecac92f3b2263fa Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 13:30:03 +0000 Subject: [PATCH 107/624] README: add apple/macbook-air/{4,6} --- README.org | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.org b/README.org index b812182e8502..a1d4badab738 100644 --- a/README.org +++ b/README.org @@ -20,6 +20,8 @@ should look like: |---------------------------+--------------------------------------------| | Acer Aspire 4810T | ~~ | | Airis N990 | ~~ | +| Apple MacBook Air 4,X | ~~ | +| Apple MacBook Air 6,X | ~~ | | Apple MacBook Pro 10,1 | ~~ | | Apple MacBook Pro 12,1 | ~~ | | Dell XPS 15 9550 | ~~ | From 008eb393030b414953596e2434c8b80c3762b10b Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 25 Dec 2017 13:24:32 +0000 Subject: [PATCH 108/624] README: add links to docs --- README.org | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.org b/README.org index a1d4badab738..ae731103e29e 100644 --- a/README.org +++ b/README.org @@ -18,14 +18,14 @@ should look like: |---------------------------+--------------------------------------------| | Model | Path | |---------------------------+--------------------------------------------| -| Acer Aspire 4810T | ~~ | +| [[file:acer/aspire/4810t][Acer Aspire 4810T]] | ~~ | | Airis N990 | ~~ | | Apple MacBook Air 4,X | ~~ | | Apple MacBook Air 6,X | ~~ | -| Apple MacBook Pro 10,1 | ~~ | +| [[file:apple/macbook-pro/10-1][Apple MacBook Pro 10,1]] | ~~ | | Apple MacBook Pro 12,1 | ~~ | -| Dell XPS 15 9550 | ~~ | -| Inverse Path USB armory | ~~ | +| [[file:dell/xps/15-9550][Dell XPS 15 9550]] | ~~ | +| [[file:inversepath/usbarmory][Inverse Path USB armory]] | ~~ | | Lenovo IdeaPad Z510 | ~~ | | Lenovo ThinkPad T410 | ~~ | | Lenovo ThinkPad T440p | ~~ | @@ -33,9 +33,9 @@ should look like: | Lenovo ThinkPad X140e | ~~ | | Lenovo ThinkPad X220 | ~~ | | Lenovo ThinkPad X250 | ~~ | -| Microsoft Surface Pro 3 | ~~ | -| Raspberry Pi 2 | ~~ | -| Samsung Series 9 NP900X3C | ~~ | +| [[file:microsoft/surface-pro/3][Microsoft Surface Pro 3]] | ~~ | +| [[file:raspberry-pi/2][Raspberry Pi 2]] | ~~ | +| [[file:samsung/np900x3c][Samsung Series 9 NP900X3C]] | ~~ | | Supermicro A1SRi-2758F | ~~ | | Supermicro X10SLL-F | ~~ | |---------------------------+--------------------------------------------| From 571bea15a4fbc8a89990a3dfe0156c21713505ad Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 14:39:59 +0000 Subject: [PATCH 109/624] CODEWONERS: init --- CODEOWNERS | 1 + lenovo/thinkpad/x250/default.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 CODEOWNERS diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 000000000000..436b94766fc5 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +lenovo/thinkpad/x250 @Mic92 diff --git a/lenovo/thinkpad/x250/default.nix b/lenovo/thinkpad/x250/default.nix index 36a1a8e6036c..c88fa787e1c4 100644 --- a/lenovo/thinkpad/x250/default.nix +++ b/lenovo/thinkpad/x250/default.nix @@ -10,6 +10,4 @@ # However it requires to set a different `sensor` for this hardware, since there is no /proc/acpi/ibm/thermal # Regulation also works fine without thinkfan daemon though. services.thinkfan.enable = lib.mkOverride 900 false; - - # maintainers: Mic92 } From 83890749b29b56bf294ba5f088b3c179e269e7a1 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 25 Dec 2017 15:07:07 +0000 Subject: [PATCH 110/624] add Travis CI to the repo --- .travis.yml | 3 +++ tests/eval-test.sh | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000000..3471081b2121 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +language: nix +sudo: true # needed by the nix install +script: ./tests/eval-test.sh diff --git a/tests/eval-test.sh b/tests/eval-test.sh index 00970b775636..5be91033b3ff 100755 --- a/tests/eval-test.sh +++ b/tests/eval-test.sh @@ -7,10 +7,11 @@ find=(find . -name default.nix) for profile in `${find[@]}`; do echo evaluating $profile >&2 - nixos-rebuild \ - -I nixos-config=tests/eval-test.nix \ - -I nixos-hardware-profile=$profile \ - dry-build + nix-build '' \ + -I nixos-config=tests/eval-test.nix \ + -I nixos-hardware-profile=$profile \ + -A system \ + --dry-run if [ $? -ne 0 ]; then exit 1 From 459ac00c62728c2db61dc080c2f31090215df36a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Mon, 25 Dec 2017 17:23:16 +0000 Subject: [PATCH 111/624] tests/eval-test: clean up --- tests/eval-test.sh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/tests/eval-test.sh b/tests/eval-test.sh index 5be91033b3ff..0e7fca1cc7b1 100755 --- a/tests/eval-test.sh +++ b/tests/eval-test.sh @@ -1,19 +1,15 @@ #!/bin/sh -cd $(dirname $0)/.. +set -e -find=(find . -name default.nix) +cd "$(dirname "$0")/.." -for profile in `${find[@]}`; do - echo evaluating $profile >&2 +for profile in $(find . -name default.nix); do + echo evaluating $profile >&2 - nix-build '' \ - -I nixos-config=tests/eval-test.nix \ - -I nixos-hardware-profile=$profile \ - -A system \ - --dry-run - - if [ $? -ne 0 ]; then - exit 1 - fi + nix-build '' \ + -I nixos-config=tests/eval-test.nix \ + -I nixos-hardware-profile=$profile \ + -A system \ + --dry-run done From f1952eae0421a3c1fe19f93679443af3246afc08 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 19:21:11 +0000 Subject: [PATCH 112/624] tests/eval-test: Add --show-trace from #44 --- tests/eval-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/eval-test.sh b/tests/eval-test.sh index 0e7fca1cc7b1..f07dc15806b7 100755 --- a/tests/eval-test.sh +++ b/tests/eval-test.sh @@ -11,5 +11,6 @@ for profile in $(find . -name default.nix); do -I nixos-config=tests/eval-test.nix \ -I nixos-hardware-profile=$profile \ -A system \ - --dry-run + --dry-run \ + --show-trace done From 8d578a53d600153bc02f26cb3c80cf7bc9845ea6 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 19:24:01 +0000 Subject: [PATCH 113/624] tests: drop -test prefix to match naming style used by NixOS tests --- tests/{eval-test.nix => eval.nix} | 0 tests/{eval-test.sh => eval.sh} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename tests/{eval-test.nix => eval.nix} (100%) rename tests/{eval-test.sh => eval.sh} (85%) diff --git a/tests/eval-test.nix b/tests/eval.nix similarity index 100% rename from tests/eval-test.nix rename to tests/eval.nix diff --git a/tests/eval-test.sh b/tests/eval.sh similarity index 85% rename from tests/eval-test.sh rename to tests/eval.sh index f07dc15806b7..0f21fe3f1e90 100755 --- a/tests/eval-test.sh +++ b/tests/eval.sh @@ -8,7 +8,7 @@ for profile in $(find . -name default.nix); do echo evaluating $profile >&2 nix-build '' \ - -I nixos-config=tests/eval-test.nix \ + -I nixos-config=tests/eval.nix \ -I nixos-hardware-profile=$profile \ -A system \ --dry-run \ From 0939f0c48c1e6afde9ea193802b443d2414b8e84 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 19:28:59 +0000 Subject: [PATCH 114/624] travis: fixup after 8d578a53d600153bc02f26cb3c80cf7bc9845ea6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3471081b2121..df72947038f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: nix sudo: true # needed by the nix install -script: ./tests/eval-test.sh +script: tests/eval.sh From 26d3f54be8b822964f6d488bdba595032d3f1a33 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 19:33:32 +0000 Subject: [PATCH 115/624] travis: drop sudo --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df72947038f4..4035b2993525 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,2 @@ language: nix -sudo: true # needed by the nix install script: tests/eval.sh From 554629a957f703f4d9382f502c86288a56f3a052 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 20:29:10 +0000 Subject: [PATCH 116/624] thinkpad: do not enable thinkfan by default --- lenovo/thinkpad/default.nix | 1 - lenovo/thinkpad/x250/default.nix | 7 ------- 2 files changed, 8 deletions(-) diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix index 52d09bcf9df0..ff22639b4fdc 100644 --- a/lenovo/thinkpad/default.nix +++ b/lenovo/thinkpad/default.nix @@ -4,7 +4,6 @@ imports = [ ../../common/pc/laptop ]; hardware.trackpoint.enable = lib.mkDefault true; - services.thinkfan.enable = lib.mkDefault true; # Fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) # services.fprintd.enable = true; diff --git a/lenovo/thinkpad/x250/default.nix b/lenovo/thinkpad/x250/default.nix index c88fa787e1c4..870d9a857742 100644 --- a/lenovo/thinkpad/x250/default.nix +++ b/lenovo/thinkpad/x250/default.nix @@ -1,13 +1,6 @@ -{ config, lib, pkgs, ... }: - { imports = [ ../. ../../../common/cpu/intel ]; - - # Thinkfan is enabled by thinkpad profile. - # However it requires to set a different `sensor` for this hardware, since there is no /proc/acpi/ibm/thermal - # Regulation also works fine without thinkfan daemon though. - services.thinkfan.enable = lib.mkOverride 900 false; } From d1d99eb15887cedb0d6dba66e4482c53cb809c1d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Dec 2017 21:26:29 +0000 Subject: [PATCH 117/624] treewide: mark things that have to be done --- acer/aspire/4810t/default.nix | 5 +++-- apple/macbook-pro/10-1/default.nix | 2 +- audio-gd/compass2.nix | 4 +--- lenovo/thinkpad/t410/default.nix | 2 ++ lenovo/thinkpad/t440p/default.nix | 1 + lenovo/thinkpad/x220/default.nix | 2 +- microsoft/surface-pro/3/default.nix | 1 + samsung/np900x3c/default.nix | 2 ++ 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/acer/aspire/4810t/default.nix b/acer/aspire/4810t/default.nix index f21d630478de..d40b454b3aa4 100644 --- a/acer/aspire/4810t/default.nix +++ b/acer/aspire/4810t/default.nix @@ -14,14 +14,15 @@ "vga=0x317" "video=vesafb:ywrap" - # Important, to disable Kernel Mode Setting for the graphics card - # This will allow backlight regulation + # Important, disable KMS to fix backlight regulation: "nomodeset" ]; }; + # TODO: reverse compat hardware.opengl.driSupport = false; + # TODO: reverse compat services.xserver = { defaultDepth = lib.mkDefault 24; }; diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix index 06e7486fb75f..e029ef21ecac 100644 --- a/apple/macbook-pro/10-1/default.nix +++ b/apple/macbook-pro/10-1/default.nix @@ -10,7 +10,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # TODO: drop + # TODO: reverse compat hardware.opengl.driSupport32Bit = true; services.xserver = { diff --git a/audio-gd/compass2.nix b/audio-gd/compass2.nix index 6115572588e9..5268c1dab8d1 100644 --- a/audio-gd/compass2.nix +++ b/audio-gd/compass2.nix @@ -1,8 +1,6 @@ -{ config, pkgs, ... }: - { boot = { - extraModprobeConfig = '' + extraModprobeConfig = lib.mkDefault '' options snd slots=snd_usb_audio,snd-hda-intel ''; }; diff --git a/lenovo/thinkpad/t410/default.nix b/lenovo/thinkpad/t410/default.nix index 737e91fe0c33..c40801ffc0bc 100644 --- a/lenovo/thinkpad/t410/default.nix +++ b/lenovo/thinkpad/t410/default.nix @@ -8,6 +8,8 @@ ]; boot = { + # TODO: this configuration seems to be very aggressive. + # Ask @peti if it's stable or not. kernelParams = [ "drm.debug=0" "drm.vblankoffdelay=1" diff --git a/lenovo/thinkpad/t440p/default.nix b/lenovo/thinkpad/t440p/default.nix index 464c874dc60b..4dd4085794fa 100644 --- a/lenovo/thinkpad/t440p/default.nix +++ b/lenovo/thinkpad/t440p/default.nix @@ -10,6 +10,7 @@ extraModprobeConfig = lib.mkDefault '' options bbswitch use_acpi_to_detect_card_state=1 ''; + # TODO: probably enable tcsd? Is this line necessary? kernelModules = [ "tpm-rng" ]; }; } diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index e821f966fa51..3cf18e397469 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -4,7 +4,7 @@ imports = [ ../. ../../../common/cpu/intel - ../../../common/pc/laptop/hdd + ../../../common/pc/laptop/hdd # TODO: reverse compat ../tp-smapi.nix ]; } diff --git a/microsoft/surface-pro/3/default.nix b/microsoft/surface-pro/3/default.nix index 70442e654e9f..a09c60b1f205 100644 --- a/microsoft/surface-pro/3/default.nix +++ b/microsoft/surface-pro/3/default.nix @@ -4,5 +4,6 @@ # to use the type cover in the initrd boot.kernelModules = [ "hid-microsoft" ]; + # TODO: reverse compat networking.wireless.enable = lib.mkDefault true; } diff --git a/samsung/np900x3c/default.nix b/samsung/np900x3c/default.nix index 8f19af573037..ced3d7013dd8 100644 --- a/samsung/np900x3c/default.nix +++ b/samsung/np900x3c/default.nix @@ -1,3 +1,5 @@ +# TODO: use ../../common/pc/laptop + { lib, ... }: { From 1cb3a1c2d791ec8bbae4ab18fdc9167280554bd2 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 26 Dec 2017 22:54:10 +0100 Subject: [PATCH 118/624] thinkpad/x230: init --- lenovo/thinkpad/x230/default.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 lenovo/thinkpad/x230/default.nix diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix new file mode 100644 index 000000000000..daeda9e75607 --- /dev/null +++ b/lenovo/thinkpad/x230/default.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +with lib; { + imports = [ + ../. + ../../../common/cpu/intel + ]; + + boot = { + kernelModules = [ + "acpi_call" + "tpm-rng" + ]; + extraModulePackages = with config.boot.kernelPackages; [ + acpi_call + ]; + }; + + hardware.opengl.extraPackages = with pkgs; [ + vaapiIntel + vaapiVdpau + libvdpau-va-gl + ]; +} From 2251a66d95ef648a6e12cf53f1c9c6b89e70b67f Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 26 Dec 2017 22:56:05 +0100 Subject: [PATCH 119/624] README: add x230 --- README.org | 1 + 1 file changed, 1 insertion(+) diff --git a/README.org b/README.org index ae731103e29e..358daaaa9bb7 100644 --- a/README.org +++ b/README.org @@ -32,6 +32,7 @@ should look like: | Lenovo ThinkPad T460s | ~~ | | Lenovo ThinkPad X140e | ~~ | | Lenovo ThinkPad X220 | ~~ | +| Lenovo ThinkPad X230 | ~~ | | Lenovo ThinkPad X250 | ~~ | | [[file:microsoft/surface-pro/3][Microsoft Surface Pro 3]] | ~~ | | [[file:raspberry-pi/2][Raspberry Pi 2]] | ~~ | From 8552afef5b2edcdd1ca4f30944cafe62b1afe979 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 26 Dec 2017 22:57:39 +0100 Subject: [PATCH 120/624] CODEOWNERS: add makefu for x230 --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/CODEOWNERS b/CODEOWNERS index 436b94766fc5..144f5eecb0a5 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1,2 @@ lenovo/thinkpad/x250 @Mic92 +lenovo/thinkpad/x230 @makefu From ed3ba5cc2da6815650c2d32a6acad94477e7ad89 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Dec 2017 07:22:51 +0000 Subject: [PATCH 121/624] CODEOWNERS: add yegortimoshenko to Lenovo ThinkPad X230 --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 144f5eecb0a5..c704e1458e8b 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,2 @@ +lenovo/thinkpad/x230 @makefu @yegortimoshenko lenovo/thinkpad/x250 @Mic92 -lenovo/thinkpad/x230 @makefu From b1304963c8c296ee20918a3604f2d92227b1a868 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Dec 2017 07:28:30 +0000 Subject: [PATCH 122/624] common/cpu/intel: add vaapi/vdpau drivers I've tested this to work on MacBookAir4,1 and I'm going to deploy it to MacBookAir6,2 today and Lenovo ThinkPad X230 in a week from now. Also, cleaned up Lenovo ThinkPad X230 profile. --- common/cpu/intel/default.nix | 10 +++++++++- lenovo/thinkpad/x230/default.nix | 14 ++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix index e3ce9193050e..84997f18f02f 100644 --- a/common/cpu/intel/default.nix +++ b/common/cpu/intel/default.nix @@ -1,4 +1,12 @@ +{ lib, pkgs, ... }: + { - hardware.cpu.intel.updateMicrocode = true; + hardware.cpu.intel.updateMicrocode = lib.mkDefault true; services.xserver.videoDrivers = [ "intel" ]; + + hardware.opengl.extraPackages = with pkgs; [ + vaapiIntel + vaapiVdpau + libvdpau-va-gl + ]; } diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix index daeda9e75607..913b526cd012 100644 --- a/lenovo/thinkpad/x230/default.nix +++ b/lenovo/thinkpad/x230/default.nix @@ -1,24 +1,18 @@ { config, lib, pkgs, ... }: -with lib; { +{ imports = [ ../. ../../../common/cpu/intel ]; boot = { + extraModulePackages = with config.boot.kernelPackages; [ + acpi_call + ]; kernelModules = [ "acpi_call" "tpm-rng" ]; - extraModulePackages = with config.boot.kernelPackages; [ - acpi_call - ]; }; - - hardware.opengl.extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; } From 5a00ea423a39b66dff032a03973932ab4f18af91 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Dec 2017 07:46:06 +0000 Subject: [PATCH 123/624] common/pc/laptop: drop explicit vm.laptop_mode This is handled by TLP, so we don't need to set that explicitly. --- common/pc/laptop/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/common/pc/laptop/default.nix b/common/pc/laptop/default.nix index 5da1e60a449f..ebc4931dbc29 100644 --- a/common/pc/laptop/default.nix +++ b/common/pc/laptop/default.nix @@ -1,16 +1,13 @@ -{ lib, ... }: +{ config, lib, ... }: { imports = [ ../. ]; - boot.kernel.sysctl = { - "vm.laptop_mode" = lib.mkDefault 5; - }; - # TODO: fix in NixOS/nixpkgs # Disable governor set in hardware-configuration.nix, # required when services.tlp.enable is true: - powerManagement.cpuFreqGovernor = lib.mkForce null; + powerManagement.cpuFreqGovernor = + lib.mkIf config.services.tlp.enable (lib.mkForce null); services.tlp.enable = lib.mkDefault true; } From 52e84ef20106788a6fb143825aceb87893b3ecd9 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Dec 2017 16:56:19 +0000 Subject: [PATCH 124/624] LICENSE: license under CC0-1.0 --- LICENSE | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000000..47c6e27d1700 --- /dev/null +++ b/LICENSE @@ -0,0 +1,111 @@ +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator and +subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the +purpose of contributing to a commons of creative, cultural and scientific +works ("Commons") that the public can reliably and without fear of later +claims of infringement build upon, modify, incorporate in other works, reuse +and redistribute as freely as possible in any form whatsoever and for any +purposes, including without limitation commercial purposes. These owners may +contribute to the Commons to promote the ideal of a free culture and the +further production of creative, cultural and scientific works, or to gain +reputation or greater distribution for their Work in part through the use and +efforts of others. + +For these and/or other purposes and motivations, and without any expectation +of additional consideration or compensation, the person associating CC0 with a +Work (the "Affirmer"), to the extent that he or she is an owner of Copyright +and Related Rights in the Work, voluntarily elects to apply CC0 to the Work +and publicly distribute the Work under its terms, with knowledge of his or her +Copyright and Related Rights in the Work and the meaning and intended legal +effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not limited +to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, communicate, + and translate a Work; + + ii. moral rights retained by the original author(s) and/or performer(s); + + iii. publicity and privacy rights pertaining to a person's image or likeness + depicted in a Work; + + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + + v. rights protecting the extraction, dissemination, use and reuse of data in + a Work; + + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation thereof, + including any amended or successor version of such directive); and + + vii. other similar, equivalent or corresponding rights throughout the world + based on applicable law or treaty, and any national implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention of, +applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and +unconditionally waives, abandons, and surrenders all of Affirmer's Copyright +and Related Rights and associated claims and causes of action, whether now +known or unknown (including existing as well as future claims and causes of +action), in the Work (i) in all territories worldwide, (ii) for the maximum +duration provided by applicable law or treaty (including future time +extensions), (iii) in any current or future medium and for any number of +copies, and (iv) for any purpose whatsoever, including without limitation +commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes +the Waiver for the benefit of each member of the public at large and to the +detriment of Affirmer's heirs and successors, fully intending that such Waiver +shall not be subject to revocation, rescission, cancellation, termination, or +any other legal or equitable action to disrupt the quiet enjoyment of the Work +by the public as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be +judged legally invalid or ineffective under applicable law, then the Waiver +shall be preserved to the maximum extent permitted taking into account +Affirmer's express Statement of Purpose. In addition, to the extent the Waiver +is so judged Affirmer hereby grants to each affected person a royalty-free, +non transferable, non sublicensable, non exclusive, irrevocable and +unconditional license to exercise Affirmer's Copyright and Related Rights in +the Work (i) in all territories worldwide, (ii) for the maximum duration +provided by applicable law or treaty (including future time extensions), (iii) +in any current or future medium and for any number of copies, and (iv) for any +purpose whatsoever, including without limitation commercial, advertising or +promotional purposes (the "License"). The License shall be deemed effective as +of the date CC0 was applied by Affirmer to the Work. Should any part of the +License for any reason be judged legally invalid or ineffective under +applicable law, such partial invalidity or ineffectiveness shall not +invalidate the remainder of the License, and in such case Affirmer hereby +affirms that he or she will not (i) exercise any of his or her remaining +Copyright and Related Rights in the Work or (ii) assert any associated claims +and causes of action with respect to the Work, in either case contrary to +Affirmer's express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + + b. Affirmer offers the Work as-is and makes no representations or warranties + of any kind concerning the Work, express, implied, statutory or otherwise, + including without limitation warranties of title, merchantability, fitness + for a particular purpose, non infringement, or the absence of latent or + other defects, accuracy, or the present or absence of errors, whether or not + discoverable, all to the greatest extent permissible under applicable law. + + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without limitation + any person's Copyright and Related Rights in the Work. Further, Affirmer + disclaims responsibility for obtaining any necessary consents, permissions + or other rights required for any use of the Work. + + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to this + CC0 or use of the Work. From 19c0c04f614945bed1bca0e2eba8e7faaa6c7d0e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Dec 2017 21:39:31 +0000 Subject: [PATCH 125/624] apple/macbook-air/4: enable RC6p, RC6pp GPU sleep states --- apple/macbook-air/4/default.nix | 5 ++++- common/cpu/intel/sandy-bridge/default.nix | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 common/cpu/intel/sandy-bridge/default.nix diff --git a/apple/macbook-air/4/default.nix b/apple/macbook-air/4/default.nix index 146289de41e1..181a099799a1 100644 --- a/apple/macbook-air/4/default.nix +++ b/apple/macbook-air/4/default.nix @@ -1,7 +1,10 @@ { lib, ... }: { - imports = [ ../. ]; + imports = [ + ../. + ../../../common/cpu/intel/sandy-bridge + ]; boot.kernelParams = [ "acpi_backlight=vendor" diff --git a/common/cpu/intel/sandy-bridge/default.nix b/common/cpu/intel/sandy-bridge/default.nix new file mode 100644 index 000000000000..682815cee473 --- /dev/null +++ b/common/cpu/intel/sandy-bridge/default.nix @@ -0,0 +1,9 @@ +{ + imports = [ ../. ]; + + # Enables RC6, RC6p and RC6pp. + # Last two are only available on Sandy Bridge CPUs (circa 2011). + boot.kernelParams = [ + "i915.enable_rc6=7" + ]; +} From b65efccd54525139df7d6a551e921c5c1992a27f Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 27 Dec 2017 22:09:57 +0000 Subject: [PATCH 126/624] apple/macbook-air/6: add acpi_osi= kernel param --- apple/macbook-air/6/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apple/macbook-air/6/default.nix b/apple/macbook-air/6/default.nix index 9588b3061382..35fe8320478e 100644 --- a/apple/macbook-air/6/default.nix +++ b/apple/macbook-air/6/default.nix @@ -6,6 +6,9 @@ boot = { extraModulePackages = with config.boot.kernelPackages; [ mba6x_bl ]; kernelModules = [ "mba6x_bl" ]; + + # Divides power consumption by two. + kernelParams = [ "acpi_osi=" ]; }; services.xserver.deviceSection = lib.mkDefault '' From 8a352e39b50dce0cf5551b29f71a35b4b8142ba9 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 7 Jan 2018 17:26:37 +0000 Subject: [PATCH 127/624] apple/macbook-air/6: resolve tearing --- apple/macbook-air/6/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/apple/macbook-air/6/default.nix b/apple/macbook-air/6/default.nix index 35fe8320478e..555d70418b85 100644 --- a/apple/macbook-air/6/default.nix +++ b/apple/macbook-air/6/default.nix @@ -13,5 +13,6 @@ services.xserver.deviceSection = lib.mkDefault '' Option "Backlight" "mba6x_backlight" + Option "TearFree" "true" ''; } From 30fdd53a0a544634835fa361becd1e39e057ccbb Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 29 Jan 2018 13:30:43 +0000 Subject: [PATCH 128/624] lenovo/thinkpad/x230: resolve tearing --- lenovo/thinkpad/x230/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix index 913b526cd012..604df3d166d3 100644 --- a/lenovo/thinkpad/x230/default.nix +++ b/lenovo/thinkpad/x230/default.nix @@ -15,4 +15,8 @@ "tpm-rng" ]; }; + + services.xserver.deviceSection = lib.mkDefault '' + Option "TearFree" "true" + ''; } From ad35d1cd809f31aa4b75287ec7ddeb1c7b33bbb5 Mon Sep 17 00:00:00 2001 From: Fedor Logachev Date: Sat, 17 Mar 2018 16:34:18 +0000 Subject: [PATCH 129/624] default.nix, fix for nix-env -qa --- default.nix | 1 + 1 file changed, 1 insertion(+) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 000000000000..c157af788ee8 --- /dev/null +++ b/default.nix @@ -0,0 +1 @@ +{ ... }: {} From b47ca3e37766646b54a371c67c93d54e3e01cb06 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 15 May 2018 16:31:29 +0300 Subject: [PATCH 130/624] pcengines/apu: init --- pcengines/apu/default.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 pcengines/apu/default.nix diff --git a/pcengines/apu/default.nix b/pcengines/apu/default.nix new file mode 100644 index 000000000000..f59f35a25426 --- /dev/null +++ b/pcengines/apu/default.nix @@ -0,0 +1,3 @@ +{ + boot.kernelParams = [ "console=ttyS0,115200n8" ]; +} From b586e1051bcc2b68f3ed3fc725cbd43912ec8489 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Tue, 15 May 2018 15:46:41 +0200 Subject: [PATCH 131/624] add XPS 13 (9360) --- dell/xps/13-9360/default.nix | 42 +++++++++++++++++++++++++++ dell/xps/13-9360/firmware_qca6174.nix | 22 ++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 dell/xps/13-9360/default.nix create mode 100644 dell/xps/13-9360/firmware_qca6174.nix diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix new file mode 100644 index 000000000000..b580a13d799f --- /dev/null +++ b/dell/xps/13-9360/default.nix @@ -0,0 +1,42 @@ +{ lib, pkgs, ... }: +let + firmware_qca6174 = pkgs.callPackage ./firmware_qca6174.nix {}; +in +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop + ]; + boot.kernelModules = ["kvm-intel"]; # should this be in common/cpu/intel? + boot = { + loader = { + systemd-boot.enable = lib.mkDefault true; + efi.canTouchEfiVariables = lib.mkDefault true; + }; + + kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + # touchpad goes over i2c + blacklistedKernelModules = [ "psmouse" ]; + + kernelParams = [ "i915.enable_fbc=1" "i915.enable_psr=2" ]; + }; + + # intel huc, guc. qca6174 (old?) + hardware.enableRedistributableFirmware = true; + + # 4k screen, use bigger console font + i18n.consoleFont = "latarcyrheb-sun32"; + + # touchpad + services.xserver.libinput.enable = lib.mkDefault true; + + networking.wireless.enable = lib.mkDefault true; + hardware.bluetooth.enable = lib.mkDefault true; + + services.thermald.enable = lib.mkDefault true; + + # optional: without it, firmware crashes happened + hardware.firmware = lib.mkBefore [ firmware_qca6174 ]; + +} diff --git a/dell/xps/13-9360/firmware_qca6174.nix b/dell/xps/13-9360/firmware_qca6174.nix new file mode 100644 index 000000000000..c551223a2cba --- /dev/null +++ b/dell/xps/13-9360/firmware_qca6174.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + target = "QCA6174"; + branch = "4.4.1.c1"; + version = "${branch}-00042"; + name = "${target}-firmware-${version}"; + src = fetchurl { + url = "https://github.com/kvalo/ath10k-firmware/raw/master/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1"; + sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh"; + }; + buildCommand = '' + install -D $src $out/lib/firmware/ath10k/${target}/hw3.0/firmware-6.bin + ''; + meta = with stdenv.lib; { + license = with licenses; unfreeRedistributable; + homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0"; + description = "Updated firmware for the qca6174 wireless chip"; + platforms = with platforms; linux; + maintainers = with maintainers; [ yorickvp ]; + }; +} From 0794564c45956c1b4711b38d2a2d43d85d12cbae Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 15 May 2018 19:54:18 +0300 Subject: [PATCH 132/624] dell/xps/13-9360: review --- common/cpu/intel/kaby-lake/default.nix | 8 ++++ dell/xps/13-9360/default.nix | 44 ++++++------------- ...mware_qca6174.nix => qca6174-firmware.nix} | 18 +++++--- 3 files changed, 33 insertions(+), 37 deletions(-) create mode 100644 common/cpu/intel/kaby-lake/default.nix rename dell/xps/13-9360/{firmware_qca6174.nix => qca6174-firmware.nix} (86%) diff --git a/common/cpu/intel/kaby-lake/default.nix b/common/cpu/intel/kaby-lake/default.nix new file mode 100644 index 000000000000..2046cd96fb38 --- /dev/null +++ b/common/cpu/intel/kaby-lake/default.nix @@ -0,0 +1,8 @@ +{ + imports = [ ../. ]; + + kernelParams = [ + "i915.enable_fbc=1" + "i915.enable_psr=2" + ]; +} diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix index b580a13d799f..e13e758d44c7 100644 --- a/dell/xps/13-9360/default.nix +++ b/dell/xps/13-9360/default.nix @@ -1,42 +1,26 @@ { lib, pkgs, ... }: -let - firmware_qca6174 = pkgs.callPackage ./firmware_qca6174.nix {}; -in + { imports = [ - ../../../common/cpu/intel + ../../../common/cpu/intel/kaby-lake ../../../common/pc/laptop ]; - boot.kernelModules = ["kvm-intel"]; # should this be in common/cpu/intel? - boot = { - loader = { - systemd-boot.enable = lib.mkDefault true; - efi.canTouchEfiVariables = lib.mkDefault true; - }; - kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - # touchpad goes over i2c - blacklistedKernelModules = [ "psmouse" ]; + boot.blacklistedKernelModules = [ "psmouse" ]; # touchpad goes over i2c - kernelParams = [ "i915.enable_fbc=1" "i915.enable_psr=2" ]; + # TODO: decide on boot loader policy + boot.loader = { + efi.canTouchEfiVariables = lib.mkDefault true; + systemd-boot.enable = lib.mkDefault true; }; - # intel huc, guc. qca6174 (old?) - hardware.enableRedistributableFirmware = true; + hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ]; - # 4k screen, use bigger console font - i18n.consoleFont = "latarcyrheb-sun32"; - - # touchpad - services.xserver.libinput.enable = lib.mkDefault true; - - networking.wireless.enable = lib.mkDefault true; - hardware.bluetooth.enable = lib.mkDefault true; - - services.thermald.enable = lib.mkDefault true; - - # optional: without it, firmware crashes happened - hardware.firmware = lib.mkBefore [ firmware_qca6174 ]; + # TODO: move to general HiDPI profile + i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32"; # 4K screen, use bigger console font + # TODO: upstream to NixOS/nixpkgs + nixpkgs.overlays = [(final: previous: { + qca6174-firmware = final.callPackage ./qca6174-firmware.nix {}; + })]; } diff --git a/dell/xps/13-9360/firmware_qca6174.nix b/dell/xps/13-9360/qca6174-firmware.nix similarity index 86% rename from dell/xps/13-9360/firmware_qca6174.nix rename to dell/xps/13-9360/qca6174-firmware.nix index c551223a2cba..930107dffe87 100644 --- a/dell/xps/13-9360/firmware_qca6174.nix +++ b/dell/xps/13-9360/qca6174-firmware.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - target = "QCA6174"; - branch = "4.4.1.c1"; - version = "${branch}-00042"; name = "${target}-firmware-${version}"; + version = "${branch}-00042"; + + branch = "4.4.1.c1"; + target = "QCA6174"; + src = fetchurl { url = "https://github.com/kvalo/ath10k-firmware/raw/master/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1"; sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh"; }; + buildCommand = '' install -D $src $out/lib/firmware/ath10k/${target}/hw3.0/firmware-6.bin ''; + meta = with stdenv.lib; { - license = with licenses; unfreeRedistributable; - homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0"; description = "Updated firmware for the qca6174 wireless chip"; - platforms = with platforms; linux; + homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0"; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ yorickvp ]; + platforms = platforms.linux; }; } From 6ba1e22e3fc48634bd6beab7af26de5330f7621f Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 15 May 2018 23:25:30 +0300 Subject: [PATCH 133/624] qca6174-firmware: pin down commit --- dell/xps/13-9360/qca6174-firmware.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dell/xps/13-9360/qca6174-firmware.nix b/dell/xps/13-9360/qca6174-firmware.nix index 930107dffe87..c5da6c183280 100644 --- a/dell/xps/13-9360/qca6174-firmware.nix +++ b/dell/xps/13-9360/qca6174-firmware.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { target = "QCA6174"; src = fetchurl { - url = "https://github.com/kvalo/ath10k-firmware/raw/master/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1"; + url = "https://github.com/kvalo/ath10k-firmware/raw/952afa4949cb34193040cd4e7441e1aee50ac731/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1"; sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh"; }; From dd576672e724312e3f5af6d3dc92efa8f73b479f Mon Sep 17 00:00:00 2001 From: Yorick Date: Wed, 23 May 2018 14:47:58 +0200 Subject: [PATCH 134/624] common/cpu/intel/kaby-lake: fix kernelParams -> boot.kernelParams --- common/cpu/intel/kaby-lake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/cpu/intel/kaby-lake/default.nix b/common/cpu/intel/kaby-lake/default.nix index 2046cd96fb38..e6a2d1ce8e6e 100644 --- a/common/cpu/intel/kaby-lake/default.nix +++ b/common/cpu/intel/kaby-lake/default.nix @@ -1,7 +1,7 @@ { imports = [ ../. ]; - kernelParams = [ + boot.kernelParams = [ "i915.enable_fbc=1" "i915.enable_psr=2" ]; From d0a8097eec8cabbcd50fcff20548d7882feb7d8b Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Thu, 31 May 2018 15:56:43 +0200 Subject: [PATCH 135/624] Add basic support for 6th-gen X1 --- lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 9 +++++++++ lenovo/thinkpad/x1/6th-gen/default.nix | 5 +++++ lenovo/thinkpad/x1/default.nix | 6 ++++++ 3 files changed, 20 insertions(+) create mode 100644 lenovo/thinkpad/x1/6th-gen/QHD/default.nix create mode 100644 lenovo/thinkpad/x1/6th-gen/default.nix create mode 100644 lenovo/thinkpad/x1/default.nix diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix new file mode 100644 index 000000000000..55438fd7e4d4 --- /dev/null +++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix @@ -0,0 +1,9 @@ +# X1 6th generation with a QHD (2560x1440px) display +{ + imports = [ + ../. + ]; + + services.xserver.dpi = 210; + fonts.fontconfig.dpi = 210; +} diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix new file mode 100644 index 000000000000..665d3d41b750 --- /dev/null +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ../. + ]; +} diff --git a/lenovo/thinkpad/x1/default.nix b/lenovo/thinkpad/x1/default.nix new file mode 100644 index 000000000000..870d9a857742 --- /dev/null +++ b/lenovo/thinkpad/x1/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../. + ../../../common/cpu/intel + ]; +} From e0a8e0107321a86e307e9c01d91bd27b03d665d7 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Thu, 31 May 2018 18:04:02 +0200 Subject: [PATCH 136/624] Give TLP more control over the battery and enable battery life saver parameters --- lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix index 55438fd7e4d4..1122d771f16b 100644 --- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix @@ -1,9 +1,26 @@ # X1 6th generation with a QHD (2560x1440px) display +{ config, ... }: + { imports = [ ../. ]; + # give tlp more control over battery + boot = { + extraModulePackages = with config.boot.kernelPackages; [ + acpi_call + ]; + kernelModules = [ + "acpi_call" + ]; + }; + # see https://linrunner.de/en/tlp/docs/tlp-faq.html#battery + services.tlp.extraConfig = '' +START_CHARGE_THRESH_BAT0=75 +STOP_CHARGE_THRESH_BAT0=80 +''; + # fix font sizes in X services.xserver.dpi = 210; fonts.fontconfig.dpi = 210; } From 5dd535392df4ed2299ed39c4500bbd432e62cff0 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sun, 3 Jun 2018 01:28:40 +0200 Subject: [PATCH 137/624] Move battery settings to the configuration for all the 6th gen models --- lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 15 --------------- lenovo/thinkpad/x1/6th-gen/default.nix | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix index 1122d771f16b..6b53d5e77385 100644 --- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix @@ -5,21 +5,6 @@ imports = [ ../. ]; - # give tlp more control over battery - boot = { - extraModulePackages = with config.boot.kernelPackages; [ - acpi_call - ]; - kernelModules = [ - "acpi_call" - ]; - }; - - # see https://linrunner.de/en/tlp/docs/tlp-faq.html#battery - services.tlp.extraConfig = '' -START_CHARGE_THRESH_BAT0=75 -STOP_CHARGE_THRESH_BAT0=80 -''; # fix font sizes in X services.xserver.dpi = 210; fonts.fontconfig.dpi = 210; diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 665d3d41b750..ea63de06fe15 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -2,4 +2,19 @@ imports = [ ../. ]; + # Give TLP service more control over battery + boot = { + extraModulePackages = with config.boot.kernelPackages; [ + acpi_call + ]; + kernelModules = [ + "acpi_call" + ]; + }; + + # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery + services.tlp.extraConfig = '' +START_CHARGE_THRESH_BAT0=75 +STOP_CHARGE_THRESH_BAT0=80 +''; } From 654262071f8b9f0c15704d4da195c60739707e4b Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sun, 3 Jun 2018 01:31:17 +0200 Subject: [PATCH 138/624] Add the temporary fix for the cpu-throttling issue See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues --- lenovo/thinkpad/x1/6th-gen/default.nix | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index ea63de06fe15..848cc00cae73 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -1,3 +1,4 @@ +{ config, pkgs, ... }: { imports = [ ../. @@ -17,4 +18,41 @@ START_CHARGE_THRESH_BAT0=75 STOP_CHARGE_THRESH_BAT0=80 ''; + + # Temporary fix for cpu throttling issues visible in the kernel log + # (journalctl -k) by setting the same temperature limits used by + # Window$ + # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues + systemd.services.cpu-throttling = { + enable = true; + description = "Sets the offset to 3 °C, so the new trip point is 97 °C"; + documentation = [ + "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" + ]; + path = [ pkgs.msr-tools ]; + script = "wrmsr -a 0x1a2 0x3000000"; + serviceConfig = { + Type = "oneshot"; + }; + wantedBy = [ + "timers.target" + ]; + }; + + systemd.timers.cpu-throttling = { + enable = true; + description = "Set cpu heating limit to 97 °C"; + documentation = [ + "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" + ]; + timerConfig = { + OnActiveSec = 60; + OnUnitActiveSec = 60; + Unit = "cpu-throttling.service"; + }; + wantedBy = [ + "timers.target" + ]; + }; + } From 179bcde845464be4f21e4b170877e3ef61fec2b3 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sun, 3 Jun 2018 01:32:16 +0200 Subject: [PATCH 139/624] Add stub for the S3 suspend state issue See https://delta-xi.net/#056 --- lenovo/thinkpad/x1/6th-gen/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 848cc00cae73..c0b4fbd785e1 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -55,4 +55,14 @@ STOP_CHARGE_THRESH_BAT0=80 ]; }; + # Enable S3 suspend state: you have to manually follow the + # instructions shown here: https://delta-xi.net/#056 in order to + # produce the ACPI patched table. Put the CPIO archive in /boot and + # then enable the following lines + # boot.kernelParams = [ + # "mem_sleep_default=deep" + # ]; + # boot.initrd.prepend = [ + # "/boot/acpi_override" + # ]; } From b42212f6f0c617e7bbe0435fbb9e072545508521 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sun, 3 Jun 2018 01:33:21 +0200 Subject: [PATCH 140/624] Add a bit of documentation --- lenovo/thinkpad/x1/6th-gen/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index c0b4fbd785e1..7044d2879cf4 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -1,3 +1,8 @@ +# A good source of information about how to fix the issues still +# standing with kernel 4.6.11 is the following wiki page: +# https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6). The +# TrackPoint and TouchPad issues there seem to have been fixed already. + { config, pkgs, ... }: { imports = [ From b132065a431e73410cbca167118ab353647c47d6 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sun, 3 Jun 2018 01:33:37 +0200 Subject: [PATCH 141/624] Cosmetic --- lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix index 6b53d5e77385..86b2eb401168 100644 --- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix @@ -5,7 +5,7 @@ imports = [ ../. ]; - # fix font sizes in X + # Fix font sizes in X services.xserver.dpi = 210; fonts.fontconfig.dpi = 210; } From 32a7893b8c3068a32f42eab45f08faebd3a16359 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sun, 3 Jun 2018 01:55:59 +0200 Subject: [PATCH 142/624] Set a default to fix GTK/GNOME ui elements appareance --- lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix index 86b2eb401168..f99326ad8f1a 100644 --- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix @@ -1,11 +1,18 @@ # X1 6th generation with a QHD (2560x1440px) display -{ config, ... }: +{ config, lib, ... }: { imports = [ ../. ]; + # Fix font sizes in X services.xserver.dpi = 210; fonts.fontconfig.dpi = 210; + + # Fix sizes of GTK/GNOME ui elements + environment.variables = { + GDK_SCALE = lib.mkDefault "2"; + GDK_DPI_SCALE= lib.mkDefault "0.5"; + }; } From cbdcc55f37ad1df7503896492ff8c0a0e529d16e Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Fri, 8 Jun 2018 23:51:07 +0100 Subject: [PATCH 143/624] Add acpi_call module --- lenovo/thinkpad/acpi_call.nix | 10 ++++++++++ lenovo/thinkpad/x230/default.nix | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 lenovo/thinkpad/acpi_call.nix diff --git a/lenovo/thinkpad/acpi_call.nix b/lenovo/thinkpad/acpi_call.nix new file mode 100644 index 000000000000..f8c17dcc4901 --- /dev/null +++ b/lenovo/thinkpad/acpi_call.nix @@ -0,0 +1,10 @@ +# acpi_call makes tlp work for newer thinkpads + +{ config, ... }: + +{ + boot = { + kernelModules = [ "acpi_call" ]; + extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; + }; +} diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix index 604df3d166d3..32e5c13c7da6 100644 --- a/lenovo/thinkpad/x230/default.nix +++ b/lenovo/thinkpad/x230/default.nix @@ -4,14 +4,11 @@ imports = [ ../. ../../../common/cpu/intel + ../acpi_call.nix ]; boot = { - extraModulePackages = with config.boot.kernelPackages; [ - acpi_call - ]; kernelModules = [ - "acpi_call" "tpm-rng" ]; }; From c354d591a77b7566795f19780c7308bf34b14788 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Fri, 8 Jun 2018 23:54:34 +0100 Subject: [PATCH 144/624] Add basic t480s profile --- lenovo/thinkpad/t480s/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 lenovo/thinkpad/t480s/default.nix diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix new file mode 100644 index 000000000000..026332e4e9cd --- /dev/null +++ b/lenovo/thinkpad/t480s/default.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel + ../acpi_call.nix + ../. + ]; +} From 5a545d71456da6ff1f04e77860a0ee934604f464 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 18 Jun 2018 00:05:44 +0300 Subject: [PATCH 145/624] Add Purism Librem 13v3 profile --- README.org | 1 + purism/librem/13v3/README.md | 12 ++++++++++++ purism/librem/13v3/default.nix | 13 +++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 purism/librem/13v3/README.md create mode 100644 purism/librem/13v3/default.nix diff --git a/README.org b/README.org index 358daaaa9bb7..a6b1faade3d7 100644 --- a/README.org +++ b/README.org @@ -37,6 +37,7 @@ should look like: | [[file:microsoft/surface-pro/3][Microsoft Surface Pro 3]] | ~~ | | [[file:raspberry-pi/2][Raspberry Pi 2]] | ~~ | | [[file:samsung/np900x3c][Samsung Series 9 NP900X3C]] | ~~ | +| [[file:purism/librem/13v3][Purism Librem 13v3]] | ~~ | | Supermicro A1SRi-2758F | ~~ | | Supermicro X10SLL-F | ~~ | |---------------------------+--------------------------------------------| diff --git a/purism/librem/13v3/README.md b/purism/librem/13v3/README.md new file mode 100644 index 000000000000..8009eb3279c4 --- /dev/null +++ b/purism/librem/13v3/README.md @@ -0,0 +1,12 @@ +Librem comes with Coreboot + SeaBIOS payload. That means EFI boot is not +possible. Use `fdisk` to partition hard drive, and GRUB as a bootloader: + +```nix +{ + boot.loader.grub = { + enable = true; + device = "/dev/sda"; + version = 2; + }; +} +``` diff --git a/purism/librem/13v3/default.nix b/purism/librem/13v3/default.nix new file mode 100644 index 000000000000..89ae07e4e693 --- /dev/null +++ b/purism/librem/13v3/default.nix @@ -0,0 +1,13 @@ +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop + ]; + + # https://github.com/systemd/systemd/pull/9318 + services.udev.extraHwdb = '' + # Purism Librem 13 V3 + evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPurism*:pn*Librem13v3*:pvr* + KEYBOARD_KEY_56=backslash + ''; +} From e30cdb1109f152180209fc26907e4343190a6657 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Wed, 20 Jun 2018 15:02:26 +0300 Subject: [PATCH 146/624] Add PC Engines APU to the table --- README.org | 1 + 1 file changed, 1 insertion(+) diff --git a/README.org b/README.org index a6b1faade3d7..20c5670af8c8 100644 --- a/README.org +++ b/README.org @@ -35,6 +35,7 @@ should look like: | Lenovo ThinkPad X230 | ~~ | | Lenovo ThinkPad X250 | ~~ | | [[file:microsoft/surface-pro/3][Microsoft Surface Pro 3]] | ~~ | +| PC Engines APU | ~~ | | [[file:raspberry-pi/2][Raspberry Pi 2]] | ~~ | | [[file:samsung/np900x3c][Samsung Series 9 NP900X3C]] | ~~ | | [[file:purism/librem/13v3][Purism Librem 13v3]] | ~~ | From 585a13d8b929aba086bed5f1fa3317afd30c39b3 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Thu, 21 Jun 2018 16:20:57 +0300 Subject: [PATCH 147/624] Add ThinkPad X270 profile --- README.org | 1 + lenovo/thinkpad/x270/default.nix | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 lenovo/thinkpad/x270/default.nix diff --git a/README.org b/README.org index 20c5670af8c8..435241c63af6 100644 --- a/README.org +++ b/README.org @@ -34,6 +34,7 @@ should look like: | Lenovo ThinkPad X220 | ~~ | | Lenovo ThinkPad X230 | ~~ | | Lenovo ThinkPad X250 | ~~ | +| Lenovo ThinkPad X270 | ~~ | | [[file:microsoft/surface-pro/3][Microsoft Surface Pro 3]] | ~~ | | PC Engines APU | ~~ | | [[file:raspberry-pi/2][Raspberry Pi 2]] | ~~ | diff --git a/lenovo/thinkpad/x270/default.nix b/lenovo/thinkpad/x270/default.nix new file mode 100644 index 000000000000..870d9a857742 --- /dev/null +++ b/lenovo/thinkpad/x270/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ../. + ../../../common/cpu/intel + ]; +} From 212a5a7d7ca7717a573f6404c0a2d2faaaf2a6d3 Mon Sep 17 00:00:00 2001 From: Ben Ford Date: Fri, 13 Jul 2018 09:47:48 +0100 Subject: [PATCH 148/624] Add a note about rcu_sched problems How I fixed my XPS15 after it being dead for two months --- dell/xps/15-9550/README.wiki | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dell/xps/15-9550/README.wiki b/dell/xps/15-9550/README.wiki index d67395587a96..a4adf68e98b7 100644 --- a/dell/xps/15-9550/README.wiki +++ b/dell/xps/15-9550/README.wiki @@ -36,3 +36,17 @@ These settings are needed both for booting the final install, and installer itse * ''Update BIOS.'' According to Reddit, this helps with battery life. * ''Update Intel's Thunderbolt firmware.'' Without this, the Thunderbolt port will only work as power source, and not transfer data. + +=== Troubleshooting === + +==== rcu_sched freezing problems ==== + +After a recent update my machine became unstable. X couldn't start and even running `lspci` would lock the machine. I'm not sure what the root cause was, but I found the fix here: https://wiki.archlinux.org/index.php/Dell_XPS_15_9560#Troubleshooting + +TL;DR I added this line: + +``` +boot.kernelParams = [ "acpi_rev_override=1" "pcie_aspm=off" "nouveau.modeset=0" ]; +``` + + From 8b463a3ca2c55033e3d28a4739af4ddd244f7f8b Mon Sep 17 00:00:00 2001 From: Ben Ford Date: Fri, 13 Jul 2018 09:49:39 +0100 Subject: [PATCH 149/624] Add a link to the other forum thread I found --- dell/xps/15-9550/README.wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dell/xps/15-9550/README.wiki b/dell/xps/15-9550/README.wiki index a4adf68e98b7..c0e9158a883e 100644 --- a/dell/xps/15-9550/README.wiki +++ b/dell/xps/15-9550/README.wiki @@ -49,4 +49,4 @@ TL;DR I added this line: boot.kernelParams = [ "acpi_rev_override=1" "pcie_aspm=off" "nouveau.modeset=0" ]; ``` - +Some more detail about the problem can be found here: https://bbs.archlinux.org/viewtopic.php?id=223056 From 043605cfec0344b029947c306957695a2b1a1d4d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 17 Jul 2018 15:27:07 +0300 Subject: [PATCH 150/624] Fix tests --- .travis.yml | 2 +- default.nix | 47 ++++++++++++++++++++++++++++++++++++++++++++++- tests/eval.nix | 15 --------------- tests/eval.sh | 16 ---------------- 4 files changed, 47 insertions(+), 33 deletions(-) delete mode 100644 tests/eval.nix delete mode 100755 tests/eval.sh diff --git a/.travis.yml b/.travis.yml index 4035b2993525..689c9b6547cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: nix -script: tests/eval.sh +script: nix-build --dry-run --show-trace diff --git a/default.nix b/default.nix index c157af788ee8..bf722111446b 100644 --- a/default.nix +++ b/default.nix @@ -1 +1,46 @@ -{ ... }: {} +{ ... }: + +let + shim = { + boot.loader.systemd-boot.enable = true; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; + fsType = "btrfs"; + }; + + nixpkgs.config = { + allowBroken = true; + allowUnfree = true; + }; + }; + + buildProfile = profile: (import { + configuration.imports = [ profile shim ]; + }).system; +in + +{ + acer-aspire-4810t = buildProfile ./acer/aspire/4810t; + + airis-n990 = buildProfile ./airis/n990; + + apple-macbook-air-4 = buildProfile ./apple/macbook-air/4; + apple-macbook-air-6 = buildProfile ./apple/macbook-air/6; + apple-macbook-pro-10-1 = buildProfile ./apple/macbook-pro/10-1; + apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1; + + dell-xps-15-9550 = buildProfile ./dell/xps/15-9550; + + lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410; + lenovo-thinkpad-t440p = buildProfile ./lenovo/thinkpad/t440p; + lenovo-thinkpad-t460s = buildProfile ./lenovo/thinkpad/t460s; + lenovo-thinkpad-x140e = buildProfile ./lenovo/thinkpad/x140e; + lenovo-thinkpad-x220 = buildProfile ./lenovo/thinkpad/x220; + lenovo-thinkpad-x230 = buildProfile ./lenovo/thinkpad/x230; + lenovo-thinkpad-x250 = buildProfile ./lenovo/thinkpad/x250; + + microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3; + + pcengines-apu = buildProfile ./pcengines/apu; +} diff --git a/tests/eval.nix b/tests/eval.nix deleted file mode 100644 index e946b0bbef50..000000000000 --- a/tests/eval.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - imports = [ ]; - - boot.loader.systemd-boot.enable = true; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; - fsType = "btrfs"; - }; - - nixpkgs.config = { - allowBroken = true; - allowUnfree = true; - }; -} diff --git a/tests/eval.sh b/tests/eval.sh deleted file mode 100755 index 0f21fe3f1e90..000000000000 --- a/tests/eval.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -cd "$(dirname "$0")/.." - -for profile in $(find . -name default.nix); do - echo evaluating $profile >&2 - - nix-build '' \ - -I nixos-config=tests/eval.nix \ - -I nixos-hardware-profile=$profile \ - -A system \ - --dry-run \ - --show-trace -done From 7a640afbb236b093794364f7e3d718fa15832cef Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Tue, 17 Jul 2018 17:44:31 +0200 Subject: [PATCH 151/624] Add optional console font configuration to make it readable on QHD displays --- lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix index f99326ad8f1a..257b9a0cee24 100644 --- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix @@ -15,4 +15,22 @@ GDK_SCALE = lib.mkDefault "2"; GDK_DPI_SCALE= lib.mkDefault "0.5"; }; + # Enable readable font on console. The example configuration that + # foollows is taliored towards western languages. To see how to + # configure the font download the source tarball from + # http://terminus-font.sourceforge.net/ and read the README file on + # the root dir + + # i18n = { + # # this means ISO8859-1 or ISO8859-15 or Windows-1252 codepages + # # (ter-1), 16x32 px (32), normal font weight (n) + # consoleFont = "ter-132n"; + # consoleKeyMap = "us"; + # defaultLocale = "en_US.UTF-8"; + # consolePackages = [ pkgs.terminus_font ]; + # }; + + # Early configure the console to make the font readable from the + # start + # boot.earlyVconsoleSetup = true; } From a3210f1d6bf3fda69c6c190fa899699d9999d2fb Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Tue, 17 Jul 2018 17:53:53 +0200 Subject: [PATCH 152/624] Fix typo --- lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix index 257b9a0cee24..599e1e5f2d94 100644 --- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix @@ -16,7 +16,7 @@ GDK_DPI_SCALE= lib.mkDefault "0.5"; }; # Enable readable font on console. The example configuration that - # foollows is taliored towards western languages. To see how to + # follows is taliored towards western languages. To see how to # configure the font download the source tarball from # http://terminus-font.sourceforge.net/ and read the README file on # the root dir From b84f46f208d215f429fa9884db1753148bb36c1c Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Tue, 17 Jul 2018 18:55:21 +0200 Subject: [PATCH 153/624] Add missing pkgs parameter --- lenovo/thinkpad/x1/6th-gen/QHD/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix index 599e1e5f2d94..0b8555fbfb08 100644 --- a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/QHD/default.nix @@ -1,5 +1,5 @@ # X1 6th generation with a QHD (2560x1440px) display -{ config, lib, ... }: +{ config, lib, pkgs, ... }: { imports = [ From 4428c70b17e47cff73c05ca9459a0f146b712ba6 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 21 Jul 2018 21:20:25 +0200 Subject: [PATCH 154/624] Enable powersave features when on battery (taken from #60) --- lenovo/thinkpad/x1/6th-gen/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 7044d2879cf4..b28fb5baca44 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -20,9 +20,11 @@ # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery services.tlp.extraConfig = '' -START_CHARGE_THRESH_BAT0=75 -STOP_CHARGE_THRESH_BAT0=80 -''; + START_CHARGE_THRESH_BAT0=75 + STOP_CHARGE_THRESH_BAT0=80 + CPU_SCALING_GOVERNOR_ON_BAT=powersave + ENERGY_PERF_POLICY_ON_BAT=powersave + ''; # Temporary fix for cpu throttling issues visible in the kernel log # (journalctl -k) by setting the same temperature limits used by From 56b7d7254f6acb00112f25f9c38a2ff02f1f46c2 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Mon, 30 Jul 2018 14:37:29 +0200 Subject: [PATCH 155/624] Link X1 6th gen to the README (#69) --- README.org | 57 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/README.org b/README.org index 435241c63af6..ce0dcb0b4886 100644 --- a/README.org +++ b/README.org @@ -15,31 +15,32 @@ should look like: ** Profiles -|---------------------------+--------------------------------------------| -| Model | Path | -|---------------------------+--------------------------------------------| -| [[file:acer/aspire/4810t][Acer Aspire 4810T]] | ~~ | -| Airis N990 | ~~ | -| Apple MacBook Air 4,X | ~~ | -| Apple MacBook Air 6,X | ~~ | -| [[file:apple/macbook-pro/10-1][Apple MacBook Pro 10,1]] | ~~ | -| Apple MacBook Pro 12,1 | ~~ | -| [[file:dell/xps/15-9550][Dell XPS 15 9550]] | ~~ | -| [[file:inversepath/usbarmory][Inverse Path USB armory]] | ~~ | -| Lenovo IdeaPad Z510 | ~~ | -| Lenovo ThinkPad T410 | ~~ | -| Lenovo ThinkPad T440p | ~~ | -| Lenovo ThinkPad T460s | ~~ | -| Lenovo ThinkPad X140e | ~~ | -| Lenovo ThinkPad X220 | ~~ | -| Lenovo ThinkPad X230 | ~~ | -| Lenovo ThinkPad X250 | ~~ | -| Lenovo ThinkPad X270 | ~~ | -| [[file:microsoft/surface-pro/3][Microsoft Surface Pro 3]] | ~~ | -| PC Engines APU | ~~ | -| [[file:raspberry-pi/2][Raspberry Pi 2]] | ~~ | -| [[file:samsung/np900x3c][Samsung Series 9 NP900X3C]] | ~~ | -| [[file:purism/librem/13v3][Purism Librem 13v3]] | ~~ | -| Supermicro A1SRi-2758F | ~~ | -| Supermicro X10SLL-F | ~~ | -|---------------------------+--------------------------------------------| +|-----------------------------+-----------------------------------------------| +| Model | Path | +|-----------------------------+-----------------------------------------------| +| [[file:acer/aspire/4810t][Acer Aspire 4810T]] | ~~ | +| Airis N990 | ~~ | +| Apple MacBook Air 4,X | ~~ | +| Apple MacBook Air 6,X | ~~ | +| [[file:apple/macbook-pro/10-1][Apple MacBook Pro 10,1]] | ~~ | +| Apple MacBook Pro 12,1 | ~~ | +| [[file:dell/xps/15-9550][Dell XPS 15 9550]] | ~~ | +| [[file:inversepath/usbarmory][Inverse Path USB armory]] | ~~ | +| Lenovo IdeaPad Z510 | ~~ | +| Lenovo ThinkPad T410 | ~~ | +| Lenovo ThinkPad T440p | ~~ | +| Lenovo ThinkPad T460s | ~~ | +| Lenovo ThinkPad X140e | ~~ | +| Lenovo ThinkPad X220 | ~~ | +| Lenovo ThinkPad X230 | ~~ | +| Lenovo ThinkPad X250 | ~~ | +| Lenovo ThinkPad X270 | ~~ | +| [[file:lenovo/thinkpad/x1/6th-gen][Lenovo ThinkPad X1 6th gen.]] | ~~ | +| [[file:microsoft/surface-pro/3][Microsoft Surface Pro 3]] | ~~ | +| PC Engines APU | ~~ | +| [[file:raspberry-pi/2][Raspberry Pi 2]] | ~~ | +| [[file:samsung/np900x3c][Samsung Series 9 NP900X3C]] | ~~ | +| [[file:purism/librem/13v3][Purism Librem 13v3]] | ~~ | +| Supermicro A1SRi-2758F | ~~ | +| Supermicro X10SLL-F | ~~ | +|-----------------------------+-----------------------------------------------| From 93d292b8306e09a0273eb09eeee957f316b72be8 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Sun, 22 Jul 2018 17:22:08 -0400 Subject: [PATCH 156/624] apple/macbook-pro/11-5: init --- README.org | 1 + apple/macbook-pro/11-5/README.wiki | 8 ++++++++ apple/macbook-pro/11-5/default.nix | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 apple/macbook-pro/11-5/README.wiki create mode 100644 apple/macbook-pro/11-5/default.nix diff --git a/README.org b/README.org index ce0dcb0b4886..1ed22eeb5cd4 100644 --- a/README.org +++ b/README.org @@ -23,6 +23,7 @@ should look like: | Apple MacBook Air 4,X | ~~ | | Apple MacBook Air 6,X | ~~ | | [[file:apple/macbook-pro/10-1][Apple MacBook Pro 10,1]] | ~~ | +| [[file:apple/macbook-pro/11-5][Apple MacBook Pro 11,5]] | ~~ | | Apple MacBook Pro 12,1 | ~~ | | [[file:dell/xps/15-9550][Dell XPS 15 9550]] | ~~ | | [[file:inversepath/usbarmory][Inverse Path USB armory]] | ~~ | diff --git a/apple/macbook-pro/11-5/README.wiki b/apple/macbook-pro/11-5/README.wiki new file mode 100644 index 000000000000..6e1e8a82d053 --- /dev/null +++ b/apple/macbook-pro/11-5/README.wiki @@ -0,0 +1,8 @@ += Apple MacBook Pro 11,5 = + +This configuration will '''not''' work with MacBook Pro 11,2 or 11,3 models. + +The [https://support.apple.com/kb/SP719 MacBookPro11,4 and MacBookPro11,5] models ship with a discrete ATI graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU. + +You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it. + diff --git a/apple/macbook-pro/11-5/default.nix b/apple/macbook-pro/11-5/default.nix new file mode 100644 index 000000000000..b5c36a67f5dd --- /dev/null +++ b/apple/macbook-pro/11-5/default.nix @@ -0,0 +1,17 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../. + ../../../common/pc/laptop/ssd + + ]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Apparently this is currently only supported by ati_unfree drivers, not ati + hardware.opengl.driSupport32Bit = false; + + services.xserver.videoDrivers = [ "ati" ]; +} From ec4c3da28964fa585f8be62e0d69536cdc0ad6a3 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Sun, 22 Jul 2018 21:46:04 -0400 Subject: [PATCH 157/624] apple/macbook-pro/11-5: Additional wiki resources As suggested by issue #41. --- apple/macbook-pro/11-5/README.wiki | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apple/macbook-pro/11-5/README.wiki b/apple/macbook-pro/11-5/README.wiki index 6e1e8a82d053..a5070ea860bf 100644 --- a/apple/macbook-pro/11-5/README.wiki +++ b/apple/macbook-pro/11-5/README.wiki @@ -6,3 +6,7 @@ The [https://support.apple.com/kb/SP719 MacBookPro11,4 and MacBookPro11,5] model You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it. +== Additional resources == + +* Arch linux wiki: [https://wiki.archlinux.org/index.php/MacBookPro11,x MacBookPro11,x] +* Kernel patches: [https://bugzilla.kernel.org/buglist.cgi?quicksearch=macbookpro11 MacBookPro11,x] From e31b17512822fb7be589ee3701621413a36b1c64 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Sat, 28 Jul 2018 13:01:50 -0400 Subject: [PATCH 158/624] apple/macbook-pro/11-5: Change README to markdown .wiki is just plain distracting to edit, markdown allows me to quickly write up accompanying docs. --- apple/macbook-pro/11-5/README.md | 12 ++++++++++++ apple/macbook-pro/11-5/README.wiki | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 apple/macbook-pro/11-5/README.md delete mode 100644 apple/macbook-pro/11-5/README.wiki diff --git a/apple/macbook-pro/11-5/README.md b/apple/macbook-pro/11-5/README.md new file mode 100644 index 000000000000..49ddc4ad8ad5 --- /dev/null +++ b/apple/macbook-pro/11-5/README.md @@ -0,0 +1,12 @@ +# Apple MacBook Pro 11,5 + +This configuration will **not** work with MacBook Pro 11,2 or 11,3 models. + +The [MacBookPro11,4 and MacBookPro11,5](https://support.apple.com/kb/SP719) models ship with a discrete ATI graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU. + +You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it. + +## Additional resources + +* Arch linux wiki: [MacBookPro11,x](https://wiki.archlinux.org/index.php/MacBookPro11,x) +* Kernel patches: [MacBookPro11,x](https://bugzilla.kernel.org/buglist.cgi?quicksearch=macbookpro11) diff --git a/apple/macbook-pro/11-5/README.wiki b/apple/macbook-pro/11-5/README.wiki deleted file mode 100644 index a5070ea860bf..000000000000 --- a/apple/macbook-pro/11-5/README.wiki +++ /dev/null @@ -1,12 +0,0 @@ -= Apple MacBook Pro 11,5 = - -This configuration will '''not''' work with MacBook Pro 11,2 or 11,3 models. - -The [https://support.apple.com/kb/SP719 MacBookPro11,4 and MacBookPro11,5] models ship with a discrete ATI graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU. - -You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it. - -== Additional resources == - -* Arch linux wiki: [https://wiki.archlinux.org/index.php/MacBookPro11,x MacBookPro11,x] -* Kernel patches: [https://bugzilla.kernel.org/buglist.cgi?quicksearch=macbookpro11 MacBookPro11,x] From 694fd85397db316fdf18b7cf23bcbbdee2e84a67 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Sat, 28 Jul 2018 13:41:15 -0400 Subject: [PATCH 159/624] apple/macbookpro/11-5: Prevent intermittent xhci wakeup after suspend --- apple/macbook-pro/11-5/README.md | 20 ++++++++++++++++++++ apple/macbook-pro/11-5/default.nix | 15 ++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/apple/macbook-pro/11-5/README.md b/apple/macbook-pro/11-5/README.md index 49ddc4ad8ad5..17e5ef1d36e0 100644 --- a/apple/macbook-pro/11-5/README.md +++ b/apple/macbook-pro/11-5/README.md @@ -2,6 +2,26 @@ This configuration will **not** work with MacBook Pro 11,2 or 11,3 models. +## Notable features + +* Prevent intermittent USB 3.0 controller wakeup signal when the lid is closed. Without this fix your laptop may get very hot and drain the battery after waking up in your laptop bag. + + You can see for yourself which devices are allowed to wake up your laptop using the command: + + ```shell + cat /proc/acpi/wakeup + ``` + + This fix works for Linux kernel 3.13 and above. + + Sources: + + * [Fix unwanted laptop resume after lid is closed](https://medium.com/@laurynas.karvelis_95228/install-arch-linux-on-macbook-pro-11-2-retina-install-guide-for-year-2017-2034ceed4cb2#66ba) + * [Arch wiki: MacBookPro11,x Suspend](https://wiki.archlinux.org/index.php/MacBookPro11,x#Suspend) + * [simonvandel/dotfiles (nix config)](https://github.com/simonvandel/dotfiles/blob/f254a4a607257faee295ce798ed215273c342850/nixos/vandel-macair/configuration.nix#L45) + +## Graphics + The [MacBookPro11,4 and MacBookPro11,5](https://support.apple.com/kb/SP719) models ship with a discrete ATI graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU. You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it. diff --git a/apple/macbook-pro/11-5/default.nix b/apple/macbook-pro/11-5/default.nix index b5c36a67f5dd..28ce18c2eccb 100644 --- a/apple/macbook-pro/11-5/default.nix +++ b/apple/macbook-pro/11-5/default.nix @@ -1,4 +1,10 @@ -{ lib, pkgs, ... }: +{ lib, config, pkgs, ... }: + +let + + kernelPackages = config.boot.kernelPackages; + +in { imports = [ @@ -14,4 +20,11 @@ hardware.opengl.driSupport32Bit = false; services.xserver.videoDrivers = [ "ati" ]; + + services.udev.extraRules = + # Disable XHC1 wakeup signal to avoid resume getting triggered some time + # after suspend. Reboot required for this to take effect. + lib.optionalString + (lib.versionAtLeast kernelPackages.kernel.version "3.13") + ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"''; } From a9f65b889655b0730935d6754fb64926fce42bf4 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Mon, 30 Jul 2018 14:04:59 -0400 Subject: [PATCH 160/624] apple/macbook-pro/11-5: Remove boot loader Since the boot loader is already automatically generated by nixos-generate-config, there is no need to include it here. --- apple/macbook-pro/11-5/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/apple/macbook-pro/11-5/default.nix b/apple/macbook-pro/11-5/default.nix index 28ce18c2eccb..a53b5d8adeb4 100644 --- a/apple/macbook-pro/11-5/default.nix +++ b/apple/macbook-pro/11-5/default.nix @@ -13,9 +13,6 @@ in ]; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - # Apparently this is currently only supported by ati_unfree drivers, not ati hardware.opengl.driSupport32Bit = false; From d534770be7f699b3332ef09bd043745a38d115ad Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 4 Aug 2018 18:59:08 +0300 Subject: [PATCH 161/624] intel: videoDrivers: intel -> modesetting (#57) --- common/cpu/intel/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix index 84997f18f02f..78c824e70e9d 100644 --- a/common/cpu/intel/default.nix +++ b/common/cpu/intel/default.nix @@ -2,8 +2,7 @@ { hardware.cpu.intel.updateMicrocode = lib.mkDefault true; - services.xserver.videoDrivers = [ "intel" ]; - + hardware.opengl.extraPackages = with pkgs; [ vaapiIntel vaapiVdpau From a633fa6f68255b5752bb595a3ea342813db63b4f Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 15 Aug 2018 18:34:44 +0100 Subject: [PATCH 162/624] T480s: use CPU throttling fix too --- lenovo/thinkpad/cpu-throttling-bug.nix | 38 +++++++++++++++++++++ lenovo/thinkpad/t480s/default.nix | 1 + lenovo/thinkpad/x1/6th-gen/default.nix | 47 ++------------------------ 3 files changed, 41 insertions(+), 45 deletions(-) create mode 100644 lenovo/thinkpad/cpu-throttling-bug.nix diff --git a/lenovo/thinkpad/cpu-throttling-bug.nix b/lenovo/thinkpad/cpu-throttling-bug.nix new file mode 100644 index 000000000000..a44bb7225d0f --- /dev/null +++ b/lenovo/thinkpad/cpu-throttling-bug.nix @@ -0,0 +1,38 @@ +{ config, pkgs, ... }: +{ + # Temporary fix for cpu throttling issues visible in the kernel log + # (journalctl -k) by setting the same temperature limits used by + # Window$ + # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues + systemd.services.cpu-throttling = { + enable = true; + description = "Sets the offset to 3 °C, so the new trip point is 97 °C"; + documentation = [ + "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" + ]; + path = [ pkgs.msr-tools ]; + script = "wrmsr -a 0x1a2 0x3000000"; + serviceConfig = { + Type = "oneshot"; + }; + wantedBy = [ + "timers.target" + ]; + }; + + systemd.timers.cpu-throttling = { + enable = true; + description = "Set cpu heating limit to 97 °C"; + documentation = [ + "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" + ]; + timerConfig = { + OnActiveSec = 60; + OnUnitActiveSec = 60; + Unit = "cpu-throttling.service"; + }; + wantedBy = [ + "timers.target" + ]; + }; +} diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix index 026332e4e9cd..2f4b8a9129e3 100644 --- a/lenovo/thinkpad/t480s/default.nix +++ b/lenovo/thinkpad/t480s/default.nix @@ -4,6 +4,7 @@ imports = [ ../../../common/cpu/intel ../acpi_call.nix + ../cpu-throttling-bug.nix ../. ]; } diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index b28fb5baca44..4fc8ece4aef0 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -7,16 +7,9 @@ { imports = [ ../. + ../../cpu-throttling.nix + ../../acpi_call.nix ]; - # Give TLP service more control over battery - boot = { - extraModulePackages = with config.boot.kernelPackages; [ - acpi_call - ]; - kernelModules = [ - "acpi_call" - ]; - }; # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery services.tlp.extraConfig = '' @@ -26,42 +19,6 @@ ENERGY_PERF_POLICY_ON_BAT=powersave ''; - # Temporary fix for cpu throttling issues visible in the kernel log - # (journalctl -k) by setting the same temperature limits used by - # Window$ - # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues - systemd.services.cpu-throttling = { - enable = true; - description = "Sets the offset to 3 °C, so the new trip point is 97 °C"; - documentation = [ - "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" - ]; - path = [ pkgs.msr-tools ]; - script = "wrmsr -a 0x1a2 0x3000000"; - serviceConfig = { - Type = "oneshot"; - }; - wantedBy = [ - "timers.target" - ]; - }; - - systemd.timers.cpu-throttling = { - enable = true; - description = "Set cpu heating limit to 97 °C"; - documentation = [ - "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" - ]; - timerConfig = { - OnActiveSec = 60; - OnUnitActiveSec = 60; - Unit = "cpu-throttling.service"; - }; - wantedBy = [ - "timers.target" - ]; - }; - # Enable S3 suspend state: you have to manually follow the # instructions shown here: https://delta-xi.net/#056 in order to # produce the ACPI patched table. Put the CPIO archive in /boot and From 4470239d635e06eaa92e4421a0454130f735b1f0 Mon Sep 17 00:00:00 2001 From: Rehno Lindeque Date: Wed, 15 Aug 2018 19:19:36 -0400 Subject: [PATCH 163/624] apple/macbookpro/11-5: Add to tests --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index bf722111446b..c5eb0fa4982f 100644 --- a/default.nix +++ b/default.nix @@ -28,6 +28,7 @@ in apple-macbook-air-4 = buildProfile ./apple/macbook-air/4; apple-macbook-air-6 = buildProfile ./apple/macbook-air/6; apple-macbook-pro-10-1 = buildProfile ./apple/macbook-pro/10-1; + apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5; apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1; dell-xps-15-9550 = buildProfile ./dell/xps/15-9550; From 218ef7df3c71e3b3c6840a28e2aae8a261156e0d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 24 Aug 2018 13:40:52 +0300 Subject: [PATCH 164/624] Add Toshiba swanky along with documentation --- toshiba/swanky/README.md | 63 ++++++++++++++++++++++++++++++++++++++ toshiba/swanky/default.nix | 30 ++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 toshiba/swanky/README.md create mode 100644 toshiba/swanky/default.nix diff --git a/toshiba/swanky/README.md b/toshiba/swanky/README.md new file mode 100644 index 000000000000..6780770e2957 --- /dev/null +++ b/toshiba/swanky/README.md @@ -0,0 +1,63 @@ +# Toshiba Chromebook (`swanky`) + +There might be a way to install NixOS without hardware modifications (via +enabled developer mode and SeaBIOS boot on Ctrl+L), however I'd highly +recommend replacing Google's Coreboot payload with Tianocore: that allows for +proper virtualization, suspend, removes annoying developer mode screen, and +generally just works much better. + +These instructions carry some risk of bricking your device, since you'll be +reflashing BIOS. Risk is rather low, but please for the love of god make a BIOS +backup and store it someplace safe. That's the only way to reinstall ChromeOS +back after this procedure (BIOS image has licensing info), and it's the easiest +way to unbrick (it's nice to be able to return to the last good state). + +If you ever get unlucky, you can unbrick your device using a makeshift programmer +based on Raspberry Pi or BeagleBone Black, some cables and a SOIC clip, see: +http://sicarul.com/how-to-un-brick-your-toshiba-chromebook-2-gandof-without-invoking-any-demons/ + +## Enable developer mode + +This will wipe all user data and settings from the laptop. + +Power off, then hold ESC + Refresh (F3) and abruptly press power button. You +should see "Chrome OS is missing or damaged" message, press Ctrl+D. Press enter +at the next screen, then press Ctrl+D again. Wait until the laptop boots into +ChromeOS, then power it off. + +## Disable hardware-backed BIOS write protection + +Follow guide at: https://github.com/brendenyule/NativeToshibaCB2Guide/wiki/Remove-Write-Protect + +Ignore 2.2, only follow the first part of the guide. I also placed some ductape +over #5 to make sure that metallic motherboard shield would not re-enable write +protection. + +## Flash Coreboot + Tianocore BIOS + +Go through installation dialogues until you have network access and are able to +log into Guest session. Open Chrome, press Ctrl+Alt+T to open `crosh`, type in +`shell` to get a real shell. Then, run: + +``` +$ cd ~ +$ curl -LO https://mrchromebox.tech/firmware-util.sh +$ sudo bash firmware-util.sh +``` + +Choose option 3. Do not skip BIOS backup! + +Documentation: https://mrchromebox.tech/#fwscript + +## Enable hardware-backed BIOS write protection + +This is a cool security feature, so after flashing Coreboot + Tianocore BIOS +and making sure new BIOS works, consider re-enabling BIOS protection. Just put +in the missing screw #5. + +## Install NixOS + +`dd` an image on a flash drive, partition the drive, etc. On some later models, +you can swap SSD with any other 2242 M.2 SATA SSD, but on `swanky`, you have +to live with what you have (16GB eMMC). I recommend `256MB` for EFI partition, +and the rest for `/`. diff --git a/toshiba/swanky/default.nix b/toshiba/swanky/default.nix new file mode 100644 index 000000000000..c46ed6c8daa6 --- /dev/null +++ b/toshiba/swanky/default.nix @@ -0,0 +1,30 @@ +with pkgs; + +let + ucm = fetchzip { + url = "https://github.com/plbossart/UCM/archive/2050ca78a4d1a853d1ba050b591f42e6f97adfc0.tar.gz"; + sha256 = "1rs4mpz3b965nmz0yhy6j4ga3fdz320qnpkd7d61nvpv9c3i6zwj"; + }; +in + +{ + imports = [ + ../../common/cpu/intel + ../../common/pc/laptop + ]; + + # Sound only properly works out of the box on 4.18+ kernels. + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + + # Required for screen brightness control: + boot.kernelParams = [ "acpi_backlight=vendor" ]; + + # Sound requires a custom UCM config: + system.replaceRuntimeDependencies = [{ + original = pkgs.alsaLib; + + replacement = pkgs.alsaLib.overrideAttrs (super: { + postFixup = "cp -r ${ucm}/chtmax98090 $out/share/alsa/ucm"; + }); + }]; +} From 80ad9d8b661c2ae9e8b72e226a82d7ecb6c40c08 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 24 Aug 2018 13:58:48 +0300 Subject: [PATCH 165/624] Add to README.md, redo the table in Markdown --- README.md | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.org | 47 ----------------------------------------- 2 files changed, 61 insertions(+), 47 deletions(-) create mode 100644 README.md delete mode 100644 README.org diff --git a/README.md b/README.md new file mode 100644 index 000000000000..251ff0b47117 --- /dev/null +++ b/README.md @@ -0,0 +1,61 @@ +NixOS profiles covering hardware quirks. + +## Setup + +Add and update `nixos-hardware` channel: + +``` +$ sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware +$ sudo nix-channel --update nixos-hardware +``` + +Then import an appropriate profile path from the table below. For example, to +enable ThinkPad X220 profile, your `imports` in `/etc/nixos/configuration.nix` +should look like: + +``` +imports = [ + + ./hardware-configuration.nix +]; +``` + +## Profiles + +| Model | Path | +| --------------------------------- | ------------------------------------------ | +| [Acer Aspire 4810T][] | `` | +| Airis N990 | `` | +| Apple MacBook Air 4,X | `` | +| Apple MacBook Air 6,X | `` | +| [Apple MacBook Pro 10,1][] | `` | +| Apple MacBook Pro 12,1 | `` | +| [Dell XPS 15 9550][] | `` | +| [Inverse Path USB armory][] | `` | +| Lenovo IdeaPad Z510 | `` | +| Lenovo ThinkPad T410 | `` | +| Lenovo ThinkPad T440p | `` | +| Lenovo ThinkPad T460s | `` | +| Lenovo ThinkPad X140e | `` | +| Lenovo ThinkPad X220 | `` | +| Lenovo ThinkPad X230 | `` | +| Lenovo ThinkPad X250 | `` | +| Lenovo ThinkPad X270 | `` | +| [Microsoft Surface Pro 3][] | `` | +| PC Engines APU | `` | +| [Raspberry Pi 2][] | `` | +| [Samsung Series 9 NP900X3C][] | `` | +| [Purism Librem 13v3][] | `` | +| Supermicro A1SRi-2758F | `` | +| Supermicro X10SLL-F | `` | +| [Toshiba Chromebook 2 `swanky`][] | `` | + +[Acer Aspire 4810T]: acer/aspire/4810t +[Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 +[Dell XPS 15 9550]: dell/xps/15-9550 +[Inverse Path USB armory]: inversepath/usbarmory +[Microsoft Surface Pro 3]: microsoft/surface-pro/3 +[Raspberry Pi 2]: raspberry-pi/2 +[Samsung Series 9 NP900X3C]: samsung/np900x3c +[Purism Librem 13v3]: purism/librem/13v3 +[Toshiba Chromebook 2 `swanky`]: toshiba/swanky diff --git a/README.org b/README.org deleted file mode 100644 index 1ed22eeb5cd4..000000000000 --- a/README.org +++ /dev/null @@ -1,47 +0,0 @@ -NixOS profiles covering hardware quirks. - -** Setup - -Add and update ~nixos-hardware~ channel: - - : $ sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware - : $ sudo nix-channel --update nixos-hardware - -Then import an appropriate profile path from the table below. For example, to -enable ThinkPad X220 profile, your ~imports~ in ~/etc/nixos/configuration.nix~ -should look like: - - : imports = [ ./hardware-configuration.nix ]; - -** Profiles - -|-----------------------------+-----------------------------------------------| -| Model | Path | -|-----------------------------+-----------------------------------------------| -| [[file:acer/aspire/4810t][Acer Aspire 4810T]] | ~~ | -| Airis N990 | ~~ | -| Apple MacBook Air 4,X | ~~ | -| Apple MacBook Air 6,X | ~~ | -| [[file:apple/macbook-pro/10-1][Apple MacBook Pro 10,1]] | ~~ | -| [[file:apple/macbook-pro/11-5][Apple MacBook Pro 11,5]] | ~~ | -| Apple MacBook Pro 12,1 | ~~ | -| [[file:dell/xps/15-9550][Dell XPS 15 9550]] | ~~ | -| [[file:inversepath/usbarmory][Inverse Path USB armory]] | ~~ | -| Lenovo IdeaPad Z510 | ~~ | -| Lenovo ThinkPad T410 | ~~ | -| Lenovo ThinkPad T440p | ~~ | -| Lenovo ThinkPad T460s | ~~ | -| Lenovo ThinkPad X140e | ~~ | -| Lenovo ThinkPad X220 | ~~ | -| Lenovo ThinkPad X230 | ~~ | -| Lenovo ThinkPad X250 | ~~ | -| Lenovo ThinkPad X270 | ~~ | -| [[file:lenovo/thinkpad/x1/6th-gen][Lenovo ThinkPad X1 6th gen.]] | ~~ | -| [[file:microsoft/surface-pro/3][Microsoft Surface Pro 3]] | ~~ | -| PC Engines APU | ~~ | -| [[file:raspberry-pi/2][Raspberry Pi 2]] | ~~ | -| [[file:samsung/np900x3c][Samsung Series 9 NP900X3C]] | ~~ | -| [[file:purism/librem/13v3][Purism Librem 13v3]] | ~~ | -| Supermicro A1SRi-2758F | ~~ | -| Supermicro X10SLL-F | ~~ | -|-----------------------------+-----------------------------------------------| From 631e81ce5e61eeab5cabd02d8812fbd4a3a0781b Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 24 Aug 2018 14:00:17 +0300 Subject: [PATCH 166/624] Toshiba Chromebook (`swanky`) -> Toshiba Chromebook 2 `swanky` --- toshiba/swanky/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toshiba/swanky/README.md b/toshiba/swanky/README.md index 6780770e2957..e2733358d3da 100644 --- a/toshiba/swanky/README.md +++ b/toshiba/swanky/README.md @@ -1,4 +1,4 @@ -# Toshiba Chromebook (`swanky`) +# Toshiba Chromebook 2 `swanky` There might be a way to install NixOS without hardware modifications (via enabled developer mode and SeaBIOS boot on Ctrl+L), however I'd highly From e1804a0fdce6b96230202a1c9e69c84380efe6f4 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 24 Aug 2018 14:12:28 +0300 Subject: [PATCH 167/624] toshiba/swanky: reword guide --- toshiba/swanky/README.md | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/toshiba/swanky/README.md b/toshiba/swanky/README.md index e2733358d3da..ab4c072c6b09 100644 --- a/toshiba/swanky/README.md +++ b/toshiba/swanky/README.md @@ -9,11 +9,11 @@ generally just works much better. These instructions carry some risk of bricking your device, since you'll be reflashing BIOS. Risk is rather low, but please for the love of god make a BIOS backup and store it someplace safe. That's the only way to reinstall ChromeOS -back after this procedure (BIOS image has licensing info), and it's the easiest -way to unbrick (it's nice to be able to return to the last good state). +back after this procedure (BIOS image has licensing info), and it's much easier +to use a known good state to unbrick the laptop if things go wrong. -If you ever get unlucky, you can unbrick your device using a makeshift programmer -based on Raspberry Pi or BeagleBone Black, some cables and a SOIC clip, see: +If you ever get unlucky, you can unbrick your device using Raspberry Pi, +some cables and a SOIC clip, see: http://sicarul.com/how-to-un-brick-your-toshiba-chromebook-2-gandof-without-invoking-any-demons/ ## Enable developer mode @@ -21,23 +21,25 @@ http://sicarul.com/how-to-un-brick-your-toshiba-chromebook-2-gandof-without-invo This will wipe all user data and settings from the laptop. Power off, then hold ESC + Refresh (F3) and abruptly press power button. You -should see "Chrome OS is missing or damaged" message, press Ctrl+D. Press enter +should see "Chrome OS is missing or damaged" message. Press Ctrl+D. Press enter at the next screen, then press Ctrl+D again. Wait until the laptop boots into ChromeOS, then power it off. ## Disable hardware-backed BIOS write protection -Follow guide at: https://github.com/brendenyule/NativeToshibaCB2Guide/wiki/Remove-Write-Protect +Follow the first part of the guide at: +https://github.com/brendenyule/NativeToshibaCB2Guide/wiki/Remove-Write-Protect -Ignore 2.2, only follow the first part of the guide. I also placed some ductape -over #5 to make sure that metallic motherboard shield would not re-enable write -protection. +Ignore SeaBIOS section. I also used some ductape over #5 to make sure that +metallic motherboard shield would not re-enable write protection. ## Flash Coreboot + Tianocore BIOS -Go through installation dialogues until you have network access and are able to -log into Guest session. Open Chrome, press Ctrl+Alt+T to open `crosh`, type in -`shell` to get a real shell. Then, run: +Prepare a FAT32-formatted flash drive for BIOS backup in advance. + +Go through ChromeOS installation dialogues until you have network access and +are able to log into a guest session. Open Chrome, press Ctrl+Alt+T to open +`crosh`, type in `shell` to get a real shell. Then, run: ``` $ cd ~ @@ -45,7 +47,8 @@ $ curl -LO https://mrchromebox.tech/firmware-util.sh $ sudo bash firmware-util.sh ``` -Choose option 3. Do not skip BIOS backup! +Choose "Install/Update Full ROM Firmware" option and follow instructions. +Do not skip BIOS backup! Documentation: https://mrchromebox.tech/#fwscript From 231323f697dfd817e632147dca73efdaa9ae0d92 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 24 Aug 2018 14:14:16 +0300 Subject: [PATCH 168/624] CONTRIBUTING.org -> CONTRIBUTING.md --- CONTRIBUTING.org => CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CONTRIBUTING.org => CONTRIBUTING.md (100%) diff --git a/CONTRIBUTING.org b/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.org rename to CONTRIBUTING.md From 111d7e8138a7471ded9325c1a138d3409dbc8937 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 24 Aug 2018 16:50:37 +0300 Subject: [PATCH 169/624] Add toshiba-swanky to CI --- default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/default.nix b/default.nix index c5eb0fa4982f..17612ce0897e 100644 --- a/default.nix +++ b/default.nix @@ -44,4 +44,6 @@ in microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3; pcengines-apu = buildProfile ./pcengines/apu; + + toshiba-swanky = buildProfile ./toshiba/swanky; } From 23e4b913d35dc6132a23986817836f82ee20070d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 24 Aug 2018 16:53:27 +0300 Subject: [PATCH 170/624] toshiba/swanky: fix eval --- toshiba/swanky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toshiba/swanky/default.nix b/toshiba/swanky/default.nix index c46ed6c8daa6..9504d147db00 100644 --- a/toshiba/swanky/default.nix +++ b/toshiba/swanky/default.nix @@ -1,7 +1,7 @@ -with pkgs; +{ lib, pkgs, ... }: let - ucm = fetchzip { + ucm = pkgs.fetchzip { url = "https://github.com/plbossart/UCM/archive/2050ca78a4d1a853d1ba050b591f42e6f97adfc0.tar.gz"; sha256 = "1rs4mpz3b965nmz0yhy6j4ga3fdz320qnpkd7d61nvpv9c3i6zwj"; }; From b10d7a40b864828817f0af36743c6d76a97369a1 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 25 Aug 2018 13:54:23 +0300 Subject: [PATCH 171/624] LICENSE -> COPYING --- LICENSE => COPYING | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE => COPYING (100%) diff --git a/LICENSE b/COPYING similarity index 100% rename from LICENSE rename to COPYING From 2526dcbe61bf856c9dc5e3c97e43aa2f7ae41378 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sat, 25 Aug 2018 13:55:35 +0300 Subject: [PATCH 172/624] cpu/intel: early KMS --- common/cpu/intel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix index 78c824e70e9d..05b8c0275224 100644 --- a/common/cpu/intel/default.nix +++ b/common/cpu/intel/default.nix @@ -1,6 +1,8 @@ { lib, pkgs, ... }: { + boot.initrd.kernelModules = [ "i915" ]; + hardware.cpu.intel.updateMicrocode = lib.mkDefault true; hardware.opengl.extraPackages = with pkgs; [ From e9d8b30995f4bc361bffae3c2dec5d15a6afa86f Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 17 Jul 2018 13:39:49 +0100 Subject: [PATCH 173/624] Suggestions for CONTRIBUTING --- CONTRIBUTING.md | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc6ed8a8dd4a..ea468923ae10 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,31 @@ -Profiles should favor usability and stability, so performance hacks should be -activated by an additional NixOS option or conservative and performance configs -can be declared in separate profiles. +# Writing profiles -Because profiles can only be tested with the appropriate hardware, quality -assurance is up to *you*. +When setting an option, use `lib.mkDefault` unless: +- The option *must* be set and the user should get an error if they try to override it. +- The setting should merge with the user's settings (typical for list or set options). + +For example: + +```nix +{ lib }: { + # Using mkDefault, because the user might want to disable tlp + services.tlp.enable = lib.mkDefault true; + # No need to use mkDefault, because the setting will merge with the user's setting + boot.kernelModules = [ "tmp_smapi" ]; +} +``` + +Try to avoid "opinionated" settings relating to optional features like sound, bluetooth, choice of bootloader etc. + +Where possible, use module imports to share code between similar hardware variants. + +# Performance + +Profiles should favor usability and stability, so performance improvements should either be conservative or +be guarded behind additional NixOS module options. + +If it makes sense to have a performance-focussed config, it can be declared in a separate profile. + +# Testing + +Because profiles can only be tested with the appropriate hardware, quality assurance is up to *you*. From 7f17d649cc60b3e480dfad935871cf9762ea91a8 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 15:33:27 +0200 Subject: [PATCH 174/624] Fix cpu-throttling service file reference --- lenovo/thinkpad/x1/6th-gen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 4fc8ece4aef0..1be069a87e61 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -7,7 +7,7 @@ { imports = [ ../. - ../../cpu-throttling.nix + ../../cpu-throttling-bug.nix ../../acpi_call.nix ]; From 9939e5b3a491a230834794aad2d53c4f3e4365f1 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 15:34:06 +0200 Subject: [PATCH 175/624] Fix acpi override load As proposed by @garbas in #60 --- lenovo/thinkpad/x1/6th-gen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 1be069a87e61..4a10a23156ab 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -27,6 +27,6 @@ # "mem_sleep_default=deep" # ]; # boot.initrd.prepend = [ - # "/boot/acpi_override" + # "${/boot/acpi_override}" # ]; } From 19553733f0a558d7c939c05d38a28cfab3bea703 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 16:02:16 +0200 Subject: [PATCH 176/624] Add X1 profile to the README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 251ff0b47117..2ae1fe43f988 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ imports = [ | Supermicro A1SRi-2758F | `` | | Supermicro X10SLL-F | `` | | [Toshiba Chromebook 2 `swanky`][] | `` | +| [Lenovo ThinkPad X1 gen6][] | ``| [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 From e785e2a3cb8843b17863753938241216e66d16a2 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 16:04:47 +0200 Subject: [PATCH 177/624] Unfortunately all the table has to be modified to have the changes rendered correctly --- README.md | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 2ae1fe43f988..b5fcb93ef274 100644 --- a/README.md +++ b/README.md @@ -22,34 +22,34 @@ imports = [ ## Profiles -| Model | Path | -| --------------------------------- | ------------------------------------------ | -| [Acer Aspire 4810T][] | `` | -| Airis N990 | `` | -| Apple MacBook Air 4,X | `` | -| Apple MacBook Air 6,X | `` | -| [Apple MacBook Pro 10,1][] | `` | -| Apple MacBook Pro 12,1 | `` | -| [Dell XPS 15 9550][] | `` | -| [Inverse Path USB armory][] | `` | -| Lenovo IdeaPad Z510 | `` | -| Lenovo ThinkPad T410 | `` | -| Lenovo ThinkPad T440p | `` | -| Lenovo ThinkPad T460s | `` | -| Lenovo ThinkPad X140e | `` | -| Lenovo ThinkPad X220 | `` | -| Lenovo ThinkPad X230 | `` | -| Lenovo ThinkPad X250 | `` | -| Lenovo ThinkPad X270 | `` | -| [Microsoft Surface Pro 3][] | `` | -| PC Engines APU | `` | -| [Raspberry Pi 2][] | `` | -| [Samsung Series 9 NP900X3C][] | `` | -| [Purism Librem 13v3][] | `` | -| Supermicro A1SRi-2758F | `` | -| Supermicro X10SLL-F | `` | -| [Toshiba Chromebook 2 `swanky`][] | `` | +| Model | Path | +| --------------------------------- | -------------------------------------------- | +| [Acer Aspire 4810T][] | `` | +| Airis N990 | `` | +| Apple MacBook Air 4,X | `` | +| Apple MacBook Air 6,X | `` | +| [Apple MacBook Pro 10,1][] | `` | +| Apple MacBook Pro 12,1 | `` | +| [Dell XPS 15 9550][] | `` | +| [Inverse Path USB armory][] | `` | +| Lenovo IdeaPad Z510 | `` | +| Lenovo ThinkPad T410 | `` | +| Lenovo ThinkPad T440p | `` | +| Lenovo ThinkPad T460s | `` | +| Lenovo ThinkPad X140e | `` | +| Lenovo ThinkPad X220 | `` | +| Lenovo ThinkPad X230 | `` | +| Lenovo ThinkPad X250 | `` | +| Lenovo ThinkPad X270 | `` | | [Lenovo ThinkPad X1 gen6][] | ``| +| [Microsoft Surface Pro 3][] | `` | +| PC Engines APU | `` | +| [Raspberry Pi 2][] | `` | +| [Samsung Series 9 NP900X3C][] | `` | +| [Purism Librem 13v3][] | `` | +| Supermicro A1SRi-2758F | `` | +| Supermicro X10SLL-F | `` | +| [Toshiba Chromebook 2 `swanky`][] | `` | [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 From b9bdfee8c3a6ff02b3b211892cfba7e60a7f9943 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Sat, 1 Sep 2018 16:09:44 +0200 Subject: [PATCH 178/624] Fix table rendering. Add the target of the link to the X1 profile --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b5fcb93ef274..b2742d0c5719 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ imports = [ [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory +[Lenovo ThinkPad X1 gen6]: lenovo/thinkpad/x1/6th-gen [Microsoft Surface Pro 3]: microsoft/surface-pro/3 [Raspberry Pi 2]: raspberry-pi/2 [Samsung Series 9 NP900X3C]: samsung/np900x3c From 415f4f4747fa43ef8545f020d7fa30dc829f9f0e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 2 Sep 2018 08:47:48 +0000 Subject: [PATCH 179/624] ThinkPad X1 gen6 -> ThinkPad X1 (6th Gen) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2742d0c5719..20c7a603963f 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ imports = [ | Lenovo ThinkPad X230 | `` | | Lenovo ThinkPad X250 | `` | | Lenovo ThinkPad X270 | `` | -| [Lenovo ThinkPad X1 gen6][] | ``| +| [Lenovo ThinkPad X1 (6th Gen)][] | ``| | [Microsoft Surface Pro 3][] | `` | | PC Engines APU | `` | | [Raspberry Pi 2][] | `` | @@ -55,7 +55,7 @@ imports = [ [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory -[Lenovo ThinkPad X1 gen6]: lenovo/thinkpad/x1/6th-gen +[Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen [Microsoft Surface Pro 3]: microsoft/surface-pro/3 [Raspberry Pi 2]: raspberry-pi/2 [Samsung Series 9 NP900X3C]: samsung/np900x3c From 6c550338835784d91b83bd016036c5d75ad7fbf4 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 13 Aug 2018 23:05:57 +0200 Subject: [PATCH 180/624] lenovo/thinkpad/x260: Init --- lenovo/thinkpad/x260/default.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 lenovo/thinkpad/x260/default.nix diff --git a/lenovo/thinkpad/x260/default.nix b/lenovo/thinkpad/x260/default.nix new file mode 100644 index 000000000000..999a0cf82dbc --- /dev/null +++ b/lenovo/thinkpad/x260/default.nix @@ -0,0 +1,20 @@ +{ + imports = [ + ../. + ../acpi_call.nix + ../../../common/cpu/intel + ]; + + # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery https://wiki.archlinux.org/index.php/TLP#Btrfs + services.tlp.extraConfig = '' + START_CHARGE_THRESH_BAT0=75 + STOP_CHARGE_THRESH_BAT0=80 + START_CHARGE_THRESH_BAT1=75 + STOP_CHARGE_THRESH_BAT1=80 + + SATA_LINKPWR_ON_BAT=max_performance + + CPU_SCALING_GOVERNOR_ON_BAT=powersave + ENERGY_PERF_POLICY_ON_BAT=powersave + ''; +} From bdd79454eed9425dc0d922e1e70ecee673bddade Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 17 Aug 2018 18:07:48 +0200 Subject: [PATCH 181/624] default: Add Lenovo x260 --- default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/default.nix b/default.nix index 17612ce0897e..cf01355a1ce8 100644 --- a/default.nix +++ b/default.nix @@ -40,6 +40,7 @@ in lenovo-thinkpad-x220 = buildProfile ./lenovo/thinkpad/x220; lenovo-thinkpad-x230 = buildProfile ./lenovo/thinkpad/x230; lenovo-thinkpad-x250 = buildProfile ./lenovo/thinkpad/x250; + lenovo-thinkpad-x260 = buildProfile ./lenovo/thinkpad/x260; microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3; From 0400c7e1dd48bf4f763933bc1f7e1bfd97c54022 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 30 Aug 2018 14:59:11 +0200 Subject: [PATCH 182/624] README: Add Lenovo ThinkPad x260 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 20c7a603963f..f8f2f9197e8b 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ imports = [ | Lenovo ThinkPad X220 | `` | | Lenovo ThinkPad X230 | `` | | Lenovo ThinkPad X250 | `` | +| [Lenovo ThinkPad X260][] | `` | | Lenovo ThinkPad X270 | `` | | [Lenovo ThinkPad X1 (6th Gen)][] | ``| | [Microsoft Surface Pro 3][] | `` | @@ -56,6 +57,7 @@ imports = [ [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen +[Lenovo ThinkPad X260]: lenovo/thinkpad/x260 [Microsoft Surface Pro 3]: microsoft/surface-pro/3 [Raspberry Pi 2]: raspberry-pi/2 [Samsung Series 9 NP900X3C]: samsung/np900x3c From f37c5dfb9a96f0b6bab94bcc09df98056d6a664b Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 30 Aug 2018 15:01:35 +0200 Subject: [PATCH 183/624] lenovo/thinkpad/x260: Remove opinionated TLP config --- lenovo/thinkpad/x260/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lenovo/thinkpad/x260/default.nix b/lenovo/thinkpad/x260/default.nix index 999a0cf82dbc..f400d6383664 100644 --- a/lenovo/thinkpad/x260/default.nix +++ b/lenovo/thinkpad/x260/default.nix @@ -5,16 +5,8 @@ ../../../common/cpu/intel ]; - # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery https://wiki.archlinux.org/index.php/TLP#Btrfs + # https://wiki.archlinux.org/index.php/TLP#Btrfs services.tlp.extraConfig = '' - START_CHARGE_THRESH_BAT0=75 - STOP_CHARGE_THRESH_BAT0=80 - START_CHARGE_THRESH_BAT1=75 - STOP_CHARGE_THRESH_BAT1=80 - SATA_LINKPWR_ON_BAT=max_performance - - CPU_SCALING_GOVERNOR_ON_BAT=powersave - ENERGY_PERF_POLICY_ON_BAT=powersave ''; } From 6ed4feade232d6cbf55b62f42499d2a1e405c95a Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 2 Sep 2018 01:56:49 +0200 Subject: [PATCH 184/624] lenovo/thinkpad/x260: Use `med_power_with_dipm` in TLP --- lenovo/thinkpad/x260/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/x260/default.nix b/lenovo/thinkpad/x260/default.nix index f400d6383664..46530eeb0b9c 100644 --- a/lenovo/thinkpad/x260/default.nix +++ b/lenovo/thinkpad/x260/default.nix @@ -7,6 +7,6 @@ # https://wiki.archlinux.org/index.php/TLP#Btrfs services.tlp.extraConfig = '' - SATA_LINKPWR_ON_BAT=max_performance + SATA_LINKPWR_ON_BAT=med_power_with_dipm ''; } From d5b0b9349f46eb386f292feca3395dfecf5b3e2f Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 31 Aug 2018 20:16:13 +0200 Subject: [PATCH 185/624] thinkpad: introduce t430 Copied everything from t440p, added a fix for the brightness keys --- lenovo/thinkpad/t430/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 lenovo/thinkpad/t430/default.nix diff --git a/lenovo/thinkpad/t430/default.nix b/lenovo/thinkpad/t430/default.nix new file mode 100644 index 000000000000..09cee74942e9 --- /dev/null +++ b/lenovo/thinkpad/t430/default.nix @@ -0,0 +1,15 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../. + ../../../common/cpu/intel + ]; + + boot = { + kernelParams = [ + # fixes brightness keys, see https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_T430s + "acpi_osi\='!Windows 2012'" + ]; + }; +} From 142530bb885eb5ae32215a0ddb5ba05b69b2beff Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 1 Sep 2018 00:30:55 +0200 Subject: [PATCH 186/624] README: add Lenovo Thinkpad T430 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f8f2f9197e8b..53d64638435b 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ imports = [ | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | | Lenovo ThinkPad T410 | `` | +| Lenovo ThinkPad T430 | `` | | Lenovo ThinkPad T440p | `` | | Lenovo ThinkPad T460s | `` | | Lenovo ThinkPad X140e | `` | From f78fd94f634da9295fbb447d470224dce681941d Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 12 Oct 2018 13:12:52 +0000 Subject: [PATCH 187/624] beagleboard/pocketbeagle: init --- README.md | 3 ++- beagleboard/pocketbeagle/default.nix | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 beagleboard/pocketbeagle/default.nix diff --git a/README.md b/README.md index 53d64638435b..3b3f34a7d5a4 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ imports = [ | Apple MacBook Air 6,X | `` | | [Apple MacBook Pro 10,1][] | `` | | Apple MacBook Pro 12,1 | `` | +| BeagleBoard PocketBeagle | `` | | [Dell XPS 15 9550][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | @@ -41,7 +42,7 @@ imports = [ | Lenovo ThinkPad X220 | `` | | Lenovo ThinkPad X230 | `` | | Lenovo ThinkPad X250 | `` | -| [Lenovo ThinkPad X260][] | `` | +| [Lenovo ThinkPad X260][] | `` | | Lenovo ThinkPad X270 | `` | | [Lenovo ThinkPad X1 (6th Gen)][] | ``| | [Microsoft Surface Pro 3][] | `` | diff --git a/beagleboard/pocketbeagle/default.nix b/beagleboard/pocketbeagle/default.nix new file mode 100644 index 000000000000..bc426300f458 --- /dev/null +++ b/beagleboard/pocketbeagle/default.nix @@ -0,0 +1,10 @@ +{ lib, ... }: + +{ + boot.kernelParams = [ "console=ttyO0,115200n8" ]; + + boot.loader = { + generic-extlinux-compatible.enable = lib.mkDefault true; + grub.enable = lib.mkDefault false; + }; +} From 78a1e6168fcb7edde4fbd2ba3f1c8588a779135e Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Fri, 12 Oct 2018 13:13:16 +0000 Subject: [PATCH 188/624] CODEOWNERS: add yegortimoshenko to three devices - BeagleBoard PocketBeagle - PC Engines APU - Purism Librem 13v3 --- CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index c704e1458e8b..f3c0e8fe22ff 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,5 @@ +beagleboard/pocketbeagle @yegortimoshenko lenovo/thinkpad/x230 @makefu @yegortimoshenko lenovo/thinkpad/x250 @Mic92 +pcengines/apu @yegortimoshenko +purism/librem/13v3 @yegortimoshenko From 78ea74365a22e0ef72e3fed5d27d946883f62b11 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 14 Oct 2018 00:54:06 +0200 Subject: [PATCH 189/624] lenovo/thinkpad/t450s: init --- README.md | 1 + default.nix | 1 + lenovo/thinkpad/t450s/default.nix | 9 +++++++++ 3 files changed, 11 insertions(+) create mode 100644 lenovo/thinkpad/t450s/default.nix diff --git a/README.md b/README.md index 3b3f34a7d5a4..5bd0a155b6c9 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ imports = [ | Lenovo ThinkPad T410 | `` | | Lenovo ThinkPad T430 | `` | | Lenovo ThinkPad T440p | `` | +| Lenovo ThinkPad T450s | `` | | Lenovo ThinkPad T460s | `` | | Lenovo ThinkPad X140e | `` | | Lenovo ThinkPad X220 | `` | diff --git a/default.nix b/default.nix index cf01355a1ce8..9f1c7a2ff6f6 100644 --- a/default.nix +++ b/default.nix @@ -35,6 +35,7 @@ in lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410; lenovo-thinkpad-t440p = buildProfile ./lenovo/thinkpad/t440p; + lenovo-thinkpad-t450s = buildProfile ./lenovo/thinkpad/t450s; lenovo-thinkpad-t460s = buildProfile ./lenovo/thinkpad/t460s; lenovo-thinkpad-x140e = buildProfile ./lenovo/thinkpad/x140e; lenovo-thinkpad-x220 = buildProfile ./lenovo/thinkpad/x220; diff --git a/lenovo/thinkpad/t450s/default.nix b/lenovo/thinkpad/t450s/default.nix new file mode 100644 index 000000000000..026332e4e9cd --- /dev/null +++ b/lenovo/thinkpad/t450s/default.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel + ../acpi_call.nix + ../. + ]; +} From 86cbb3256bcf99cb2f287a62f1119c7604d27346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 19 Oct 2018 15:45:05 +0200 Subject: [PATCH 190/624] dell/xps/13-9370: init --- README.md | 2 ++ default.nix | 1 + dell/xps/13-9370/README.wiki | 16 ++++++++++++++++ dell/xps/13-9370/default.nix | 16 ++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100644 dell/xps/13-9370/README.wiki create mode 100644 dell/xps/13-9370/default.nix diff --git a/README.md b/README.md index 5bd0a155b6c9..f20bc64487e2 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ imports = [ | [Apple MacBook Pro 10,1][] | `` | | Apple MacBook Pro 12,1 | `` | | BeagleBoard PocketBeagle | `` | +| [Dell XPS 13 9370][] | `` | | [Dell XPS 15 9550][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | @@ -57,6 +58,7 @@ imports = [ [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 +[Dell XPS 13 9370]: dell/xps/13-9370 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen diff --git a/default.nix b/default.nix index 9f1c7a2ff6f6..097b8bc5f90a 100644 --- a/default.nix +++ b/default.nix @@ -31,6 +31,7 @@ in apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5; apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1; + dell-xps-13-9370 = buildProfile ./dell/xps/13-9370; dell-xps-15-9550 = buildProfile ./dell/xps/15-9550; lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410; diff --git a/dell/xps/13-9370/README.wiki b/dell/xps/13-9370/README.wiki new file mode 100644 index 000000000000..57b5e08d3850 --- /dev/null +++ b/dell/xps/13-9370/README.wiki @@ -0,0 +1,16 @@ += Dell XPS 13 9370 = + +== Battery drain when sleeping == + +The laptop uses the S2 sleep mode by default instead of S3, which leads to +draining a lot of battery during sleep. + +Though this is intentional by the manufacturer and might cause lockups when +forced I - @moredread - never had any issues with it. + +See https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370)#Power_Management +and https://bugzilla.kernel.org/show_bug.cgi?id=199689#c3 for reference + +== Additional resources == + +* Arch linux wiki: [https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370) Dell XPS 13 9370] diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix new file mode 100644 index 000000000000..06e339fd88b8 --- /dev/null +++ b/dell/xps/13-9370/default.nix @@ -0,0 +1,16 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel/kaby-lake + ../../../common/pc/laptop + ../../../lenovo/thinkpad/acpi_call.nix + ../../../lenovo/thinkpad/cpu-throttling-bug.nix + ]; + + # Force S3 sleep mode. See README.wiki for details. + boot.kernelParams = [ "mem_sleep_default=deep" ]; + + # touchpad goes over i2c + boot.blacklistedKernelModules = [ "psmouse" ]; +} From d4a430fef28b584bfcf580a681cd63330a232241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 19 Oct 2018 15:46:09 +0200 Subject: [PATCH 191/624] CODEOWNERS: add moredread for Dell XPS 13 9370 --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/CODEOWNERS b/CODEOWNERS index f3c0e8fe22ff..563d5163ce17 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,5 @@ beagleboard/pocketbeagle @yegortimoshenko +dell/xps/13-9370 @moredread lenovo/thinkpad/x230 @makefu @yegortimoshenko lenovo/thinkpad/x250 @Mic92 pcengines/apu @yegortimoshenko From 941fbef86f558b9a39e6d1460ba5a34ecd72ebd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Fri, 19 Oct 2018 17:52:25 +0200 Subject: [PATCH 192/624] move acpi_call.nix and cpu-throttling-bug.nix to common folder --- {lenovo/thinkpad => common/pc/laptop}/acpi_call.nix | 0 {lenovo/thinkpad => common/pc/laptop}/cpu-throttling-bug.nix | 0 dell/xps/13-9370/default.nix | 4 ++-- lenovo/thinkpad/t450s/default.nix | 2 +- lenovo/thinkpad/t480s/default.nix | 4 ++-- lenovo/thinkpad/x1/6th-gen/default.nix | 4 ++-- lenovo/thinkpad/x230/default.nix | 2 +- lenovo/thinkpad/x260/default.nix | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename {lenovo/thinkpad => common/pc/laptop}/acpi_call.nix (100%) rename {lenovo/thinkpad => common/pc/laptop}/cpu-throttling-bug.nix (100%) diff --git a/lenovo/thinkpad/acpi_call.nix b/common/pc/laptop/acpi_call.nix similarity index 100% rename from lenovo/thinkpad/acpi_call.nix rename to common/pc/laptop/acpi_call.nix diff --git a/lenovo/thinkpad/cpu-throttling-bug.nix b/common/pc/laptop/cpu-throttling-bug.nix similarity index 100% rename from lenovo/thinkpad/cpu-throttling-bug.nix rename to common/pc/laptop/cpu-throttling-bug.nix diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix index 06e339fd88b8..cd53acd02fc0 100644 --- a/dell/xps/13-9370/default.nix +++ b/dell/xps/13-9370/default.nix @@ -4,8 +4,8 @@ imports = [ ../../../common/cpu/intel/kaby-lake ../../../common/pc/laptop - ../../../lenovo/thinkpad/acpi_call.nix - ../../../lenovo/thinkpad/cpu-throttling-bug.nix + ../../../common/pc/laptop/acpi_call.nix + ../../../common/pc/laptop/cpu-throttling-bug.nix ]; # Force S3 sleep mode. See README.wiki for details. diff --git a/lenovo/thinkpad/t450s/default.nix b/lenovo/thinkpad/t450s/default.nix index 026332e4e9cd..e62337171b9a 100644 --- a/lenovo/thinkpad/t450s/default.nix +++ b/lenovo/thinkpad/t450s/default.nix @@ -3,7 +3,7 @@ { imports = [ ../../../common/cpu/intel - ../acpi_call.nix + ../../../common/pc/laptop/acpi_call.nix ../. ]; } diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix index 2f4b8a9129e3..3e079d5fb060 100644 --- a/lenovo/thinkpad/t480s/default.nix +++ b/lenovo/thinkpad/t480s/default.nix @@ -3,8 +3,8 @@ { imports = [ ../../../common/cpu/intel - ../acpi_call.nix - ../cpu-throttling-bug.nix + ../../../common/pc/laptop/acpi_call.nix + ../../../common/pc/laptop/cpu-throttling-bug.nix ../. ]; } diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 4a10a23156ab..9584bc744571 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -7,8 +7,8 @@ { imports = [ ../. - ../../cpu-throttling-bug.nix - ../../acpi_call.nix + ../../../../common/pc/laptop/acpi_call.nix + ../../../../common/pc/laptop/cpu-throttling-bug.nix ]; # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix index 32e5c13c7da6..58b09f4c5d5f 100644 --- a/lenovo/thinkpad/x230/default.nix +++ b/lenovo/thinkpad/x230/default.nix @@ -4,7 +4,7 @@ imports = [ ../. ../../../common/cpu/intel - ../acpi_call.nix + ../../../common/pc/laptop/acpi_call.nix ]; boot = { diff --git a/lenovo/thinkpad/x260/default.nix b/lenovo/thinkpad/x260/default.nix index 46530eeb0b9c..d64a53075163 100644 --- a/lenovo/thinkpad/x260/default.nix +++ b/lenovo/thinkpad/x260/default.nix @@ -1,8 +1,8 @@ { imports = [ ../. - ../acpi_call.nix ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix ]; # https://wiki.archlinux.org/index.php/TLP#Btrfs From 1d254aceda0ba852c83aa7dcbfd215e1f70ada35 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 30 Oct 2018 18:16:36 +0000 Subject: [PATCH 193/624] common/cpu: default microcode updates to enableRedistributableFirmware --- common/cpu/amd/default.nix | 5 ++++- common/cpu/intel/default.nix | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/common/cpu/amd/default.nix b/common/cpu/amd/default.nix index a8a36b2c91ba..d8c48a263081 100644 --- a/common/cpu/amd/default.nix +++ b/common/cpu/amd/default.nix @@ -1,3 +1,6 @@ +{ config, lib, ... }: + { - hardware.cpu.amd.updateMicrocode = true; + hardware.cpu.amd.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix index 05b8c0275224..7f2223c72e40 100644 --- a/common/cpu/intel/default.nix +++ b/common/cpu/intel/default.nix @@ -1,9 +1,10 @@ -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: { boot.initrd.kernelModules = [ "i915" ]; - hardware.cpu.intel.updateMicrocode = lib.mkDefault true; + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.opengl.extraPackages = with pkgs; [ vaapiIntel From 1e2c130d38d72860660474c36207b099c519cb6a Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 3 Dec 2018 00:25:43 +0100 Subject: [PATCH 194/624] add basic support for Lenovo Thinkpad T440s (#83) This adds basic support for the Thinkpad T440s, based on the work done for the T440p. The expression enables: - microcode updates - trackpoint support - kernel module for battery level management --- README.md | 1 + lenovo/thinkpad/t440s/default.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 lenovo/thinkpad/t440s/default.nix diff --git a/README.md b/README.md index f20bc64487e2..10f64bb15131 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ imports = [ | Lenovo IdeaPad Z510 | `` | | Lenovo ThinkPad T410 | `` | | Lenovo ThinkPad T430 | `` | +| Lenovo ThinkPad T440s | `` | | Lenovo ThinkPad T440p | `` | | Lenovo ThinkPad T450s | `` | | Lenovo ThinkPad T460s | `` | diff --git a/lenovo/thinkpad/t440s/default.nix b/lenovo/thinkpad/t440s/default.nix new file mode 100644 index 000000000000..c40ad90f9b3d --- /dev/null +++ b/lenovo/thinkpad/t440s/default.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../. + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ]; + + boot = { + # TODO: probably enable tcsd? Is this line necessary? + kernelModules = [ "tpm-rng" ]; + }; +} From bd1ef85b981093151a3ac1127b2313870d236de4 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Thu, 27 Dec 2018 17:29:47 -0500 Subject: [PATCH 195/624] lenovo x1 carbon gen6: update S3 suspend With UEFI >= 1.30, there's an explicit option to enable S3 power management. Once this is selected, S3 is enabled and "deep" is selected as the default /sys/power/mem_sleep value without requiring any kernel boot parameters. --- lenovo/thinkpad/x1/6th-gen/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 9584bc744571..f876c08bc518 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -2,7 +2,9 @@ # standing with kernel 4.6.11 is the following wiki page: # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6). The # TrackPoint and TouchPad issues there seem to have been fixed already. - +# +# Enable the lower-power S3 suspend state by upgrading the BIOS to version >= 1.30, +# then manually selecting Linux in the power management section. { config, pkgs, ... }: { imports = [ @@ -18,15 +20,4 @@ CPU_SCALING_GOVERNOR_ON_BAT=powersave ENERGY_PERF_POLICY_ON_BAT=powersave ''; - - # Enable S3 suspend state: you have to manually follow the - # instructions shown here: https://delta-xi.net/#056 in order to - # produce the ACPI patched table. Put the CPIO archive in /boot and - # then enable the following lines - # boot.kernelParams = [ - # "mem_sleep_default=deep" - # ]; - # boot.initrd.prepend = [ - # "${/boot/acpi_override}" - # ]; } From b4e2df6aacb3cb0cdaa05cfa9203ab06ed672481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 4 Jan 2019 08:48:42 +0100 Subject: [PATCH 196/624] fix nix-env evaluation nix-env picked up `default.nix`, which contained our hardware profiles. This is not only cpu-intensive to evaluate but also fails because it does some import-from-derivation. By moving default.nix to release.nix it should be no longer loaded --- .travis.yml | 2 +- default.nix => release.nix | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename default.nix => release.nix (100%) diff --git a/.travis.yml b/.travis.yml index 689c9b6547cb..30ff7de840da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,2 @@ language: nix -script: nix-build --dry-run --show-trace +script: nix-build release.nix --dry-run --show-trace diff --git a/default.nix b/release.nix similarity index 100% rename from default.nix rename to release.nix From 411e9e10b92c2ecc5816905027d4b6dc31e3fb34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 18 Jan 2019 13:46:37 +0000 Subject: [PATCH 197/624] add dummy default.nix --- default.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 default.nix diff --git a/default.nix b/default.nix new file mode 100644 index 000000000000..fbb5b77061ff --- /dev/null +++ b/default.nix @@ -0,0 +1,3 @@ +# This file is necessary so nix-env -qa does not break, +# when nixos-hardware is used as a channel +{} From 36d8bd88cd72cfa8ee4162e6580f0a8e7de132ba Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Fri, 8 Feb 2019 08:20:06 -0800 Subject: [PATCH 198/624] dell/xps/13-9380: init (#97) This is pretty much a copy of XPS 9370, without kaby-laky and the throttle bug. I was getting lockups with the kaby-laky changes and the throttle bug did not seem to have an impact either way. --- CODEOWNERS | 1 + README.md | 2 ++ dell/xps/13-9380/README.wiki | 9 +++++++++ dell/xps/13-9380/default.nix | 14 ++++++++++++++ release.nix | 1 + 5 files changed, 27 insertions(+) create mode 100644 dell/xps/13-9380/README.wiki create mode 100644 dell/xps/13-9380/default.nix diff --git a/CODEOWNERS b/CODEOWNERS index 563d5163ce17..4f2bb2cc6463 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,5 +1,6 @@ beagleboard/pocketbeagle @yegortimoshenko dell/xps/13-9370 @moredread +dell/xps/13-9380 @kalbasit lenovo/thinkpad/x230 @makefu @yegortimoshenko lenovo/thinkpad/x250 @Mic92 pcengines/apu @yegortimoshenko diff --git a/README.md b/README.md index 10f64bb15131..cbbab0989cc9 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,7 @@ imports = [ | [Apple MacBook Pro 10,1][] | `` | | Apple MacBook Pro 12,1 | `` | | BeagleBoard PocketBeagle | `` | +| [Dell XPS 13 9380][] | `` | | [Dell XPS 13 9370][] | `` | | [Dell XPS 15 9550][] | `` | | [Inverse Path USB armory][] | `` | @@ -59,6 +60,7 @@ imports = [ [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 +[Dell XPS 13 9380]: dell/xps/13-9380 [Dell XPS 13 9370]: dell/xps/13-9370 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory diff --git a/dell/xps/13-9380/README.wiki b/dell/xps/13-9380/README.wiki new file mode 100644 index 000000000000..a2a7f5deb2bf --- /dev/null +++ b/dell/xps/13-9380/README.wiki @@ -0,0 +1,9 @@ += Dell XPS 13 9380 = + +== Battery drain when sleeping == + +The laptop uses the S2 sleep mode by default instead of S3, which leads to +draining a lot of battery during sleep. + +See https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370)#Power_Management +and https://bugzilla.kernel.org/show_bug.cgi?id=199689#c3 for reference diff --git a/dell/xps/13-9380/default.nix b/dell/xps/13-9380/default.nix new file mode 100644 index 000000000000..47e676509d72 --- /dev/null +++ b/dell/xps/13-9380/default.nix @@ -0,0 +1,14 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../common/pc/laptop + ../../../common/pc/laptop/acpi_call.nix + ]; + + # Force S3 sleep mode. See README.wiki for details. + boot.kernelParams = [ "mem_sleep_default=deep" ]; + + # touchpad goes over i2c + boot.blacklistedKernelModules = [ "psmouse" ]; +} diff --git a/release.nix b/release.nix index 097b8bc5f90a..11ba88831fab 100644 --- a/release.nix +++ b/release.nix @@ -31,6 +31,7 @@ in apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5; apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1; + dell-xps-13-9380 = buildProfile ./dell/xps/13-9380; dell-xps-13-9370 = buildProfile ./dell/xps/13-9370; dell-xps-15-9550 = buildProfile ./dell/xps/15-9550; From 3dac9eae9a3d6b003746b0d28a10e4645e5eb357 Mon Sep 17 00:00:00 2001 From: "eyjhbb@gmail.com" Date: Tue, 19 Feb 2019 09:56:32 +0100 Subject: [PATCH 199/624] lenovo-x1: removed battery TLP threshholds --- lenovo/thinkpad/x1/6th-gen/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index f876c08bc518..295c8b0b43a6 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -12,12 +12,4 @@ ../../../../common/pc/laptop/acpi_call.nix ../../../../common/pc/laptop/cpu-throttling-bug.nix ]; - - # See https://linrunner.de/en/tlp/docs/tlp-faq.html#battery - services.tlp.extraConfig = '' - START_CHARGE_THRESH_BAT0=75 - STOP_CHARGE_THRESH_BAT0=80 - CPU_SCALING_GOVERNOR_ON_BAT=powersave - ENERGY_PERF_POLICY_ON_BAT=powersave - ''; } From a23235a6ed3c1bc3b41481b7e75e33e318bd9bb9 Mon Sep 17 00:00:00 2001 From: Tom F Date: Sun, 24 Mar 2019 18:48:11 +1100 Subject: [PATCH 200/624] pcengines/apu: expose GRUB over serial Prior to this commit, an apu's boot would go through stages of varying visibility: 1. BIOS: exposed to serial 2. GRUB: not exposed to serial 3. Linux: exposed to serial This commit changes (2) to be visible over serial, so the entire boot is visible over serial. Tested on nixos 18.09 on a https://www.pcengines.ch/apu1d.htm --- pcengines/apu/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pcengines/apu/default.nix b/pcengines/apu/default.nix index f59f35a25426..521887fe600b 100644 --- a/pcengines/apu/default.nix +++ b/pcengines/apu/default.nix @@ -1,3 +1,8 @@ { boot.kernelParams = [ "console=ttyS0,115200n8" ]; + boot.loader.grub.extraConfig = " + serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 + terminal_input serial + terminal_output serial + "; } From 1e4abf794a6b32fbad38fe427fb8c390eee53e2c Mon Sep 17 00:00:00 2001 From: Stanislas Date: Fri, 26 Apr 2019 19:43:47 +0200 Subject: [PATCH 201/624] README: Add Dell XPS 13 9360 profile (#104) And reorder other XPS 13. --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cbbab0989cc9..60fb9e9813ad 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,9 @@ imports = [ | [Apple MacBook Pro 10,1][] | `` | | Apple MacBook Pro 12,1 | `` | | BeagleBoard PocketBeagle | `` | -| [Dell XPS 13 9380][] | `` | +| [Dell XPS 13 9360][] | `` | | [Dell XPS 13 9370][] | `` | +| [Dell XPS 13 9380][] | `` | | [Dell XPS 15 9550][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | @@ -60,8 +61,9 @@ imports = [ [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 -[Dell XPS 13 9380]: dell/xps/13-9380 +[Dell XPS 13 9360]: dell/xps/13-9360 [Dell XPS 13 9370]: dell/xps/13-9370 +[Dell XPS 13 9380]: dell/xps/13-9380 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen From a8ea967866515cee5a4281ac7799bd82219e5fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Neto?= Date: Sat, 4 May 2019 15:04:05 -0300 Subject: [PATCH 202/624] t430: add acpi_call module --- lenovo/thinkpad/t430/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lenovo/thinkpad/t430/default.nix b/lenovo/thinkpad/t430/default.nix index 09cee74942e9..bdad1be9878a 100644 --- a/lenovo/thinkpad/t430/default.nix +++ b/lenovo/thinkpad/t430/default.nix @@ -4,6 +4,7 @@ imports = [ ../. ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix ]; boot = { From 127dbfd849cfe2b6d27288441bacea6a648a409e Mon Sep 17 00:00:00 2001 From: Joris Engbers Date: Wed, 8 May 2019 23:34:21 +0200 Subject: [PATCH 203/624] Add thinkpad 480s to list of profiles. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 60fb9e9813ad..339c8b60aafe 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ imports = [ | Lenovo ThinkPad T440p | `` | | Lenovo ThinkPad T450s | `` | | Lenovo ThinkPad T460s | `` | +| Lenovo ThinkPad T480s | `` | | Lenovo ThinkPad X140e | `` | | Lenovo ThinkPad X220 | `` | | Lenovo ThinkPad X230 | `` | From a5db2c9eaf4a061cf8508517d1faad949b923252 Mon Sep 17 00:00:00 2001 From: Joris Engbers Date: Wed, 8 May 2019 23:52:27 +0200 Subject: [PATCH 204/624] Add basic support for the thinkpad t470s --- README.md | 1 + lenovo/thinkpad/t470s/default.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 lenovo/thinkpad/t470s/default.nix diff --git a/README.md b/README.md index 339c8b60aafe..fbe9ff601861 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ imports = [ | Lenovo ThinkPad T440p | `` | | Lenovo ThinkPad T450s | `` | | Lenovo ThinkPad T460s | `` | +| Lenovo ThinkPad T470s | `` | | Lenovo ThinkPad T480s | `` | | Lenovo ThinkPad X140e | `` | | Lenovo ThinkPad X220 | `` | diff --git a/lenovo/thinkpad/t470s/default.nix b/lenovo/thinkpad/t470s/default.nix new file mode 100644 index 000000000000..e62337171b9a --- /dev/null +++ b/lenovo/thinkpad/t470s/default.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ../. + ]; +} From 83c44abc3f62aa8df5a51d204f84fe59fb4b8b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 1 Jul 2019 10:15:35 +0100 Subject: [PATCH 205/624] dell/xps/13-9380: also import intel profile --- dell/xps/13-9380/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/dell/xps/13-9380/default.nix b/dell/xps/13-9380/default.nix index 47e676509d72..d04f50449970 100644 --- a/dell/xps/13-9380/default.nix +++ b/dell/xps/13-9380/default.nix @@ -2,6 +2,7 @@ { imports = [ + ../../../common/cpu/intel ../../../common/pc/laptop ../../../common/pc/laptop/acpi_call.nix ]; From 2691961397e876cbca8f66bb5436d93a60248577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 1 Jul 2019 10:35:28 +0100 Subject: [PATCH 206/624] dell/xps/13-9380: mention fwupd --- dell/xps/13-9380/README.wiki | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dell/xps/13-9380/README.wiki b/dell/xps/13-9380/README.wiki index a2a7f5deb2bf..c5ad61e3fd63 100644 --- a/dell/xps/13-9380/README.wiki +++ b/dell/xps/13-9380/README.wiki @@ -1,5 +1,16 @@ = Dell XPS 13 9380 = +== Firmware upgrades == + +Note that this device is supported by [https://fwupd.org/ fwupd]. +To perform firmware upgrades just activate the service + + +services.fwupd.enable = true; + + +Then use fwupdmgr to perform updates. + == Battery drain when sleeping == The laptop uses the S2 sleep mode by default instead of S3, which leads to From f870de5eaee23912057bf9be6de66512a3c90679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 2 Jul 2019 10:49:23 +0100 Subject: [PATCH 207/624] toshiba/swanky: switch to default kernels Both unstable and 19.03 come with 4.19+ kernels making this option obsolete. --- toshiba/swanky/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/toshiba/swanky/default.nix b/toshiba/swanky/default.nix index 9504d147db00..8361df66e53f 100644 --- a/toshiba/swanky/default.nix +++ b/toshiba/swanky/default.nix @@ -13,9 +13,6 @@ in ../../common/pc/laptop ]; - # Sound only properly works out of the box on 4.18+ kernels. - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; - # Required for screen brightness control: boot.kernelParams = [ "acpi_backlight=vendor" ]; From 1d9358a8cf67004cc9067d9fb3b791848cf64e8d Mon Sep 17 00:00:00 2001 From: Victor Nawothnig Date: Thu, 4 Jul 2019 16:59:11 +0200 Subject: [PATCH 208/624] Specify a correct unit description --- common/pc/laptop/cpu-throttling-bug.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/pc/laptop/cpu-throttling-bug.nix b/common/pc/laptop/cpu-throttling-bug.nix index a44bb7225d0f..7f3caa2b2d82 100644 --- a/common/pc/laptop/cpu-throttling-bug.nix +++ b/common/pc/laptop/cpu-throttling-bug.nix @@ -6,7 +6,7 @@ # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues systemd.services.cpu-throttling = { enable = true; - description = "Sets the offset to 3 °C, so the new trip point is 97 °C"; + description = "CPU Throttling Fix"; documentation = [ "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" ]; @@ -22,7 +22,7 @@ systemd.timers.cpu-throttling = { enable = true; - description = "Set cpu heating limit to 97 °C"; + description = "CPU Throttling Fix"; documentation = [ "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" ]; From e1a10b1536ad7df486edb45d621521c96bc510af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 23 Jul 2019 09:04:03 +0100 Subject: [PATCH 209/624] enable fstrim on SSDs This will run TRIM once a week using a systemd timer. Running TRIM regularly will improves the performance and increases the SSDs lifespan. Since it is based on the utillinux no additional package is required. --- common/pc/ssd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/pc/ssd/default.nix b/common/pc/ssd/default.nix index af0b49568cd1..00922e649938 100644 --- a/common/pc/ssd/default.nix +++ b/common/pc/ssd/default.nix @@ -4,4 +4,6 @@ boot.kernel.sysctl = { "vm.swappiness" = lib.mkDefault 1; }; + + services.fstrim.enable = lib.mkDefault true; } From 4c8b4cf54fea8d3a67152b1292bec4b15ce5feec Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 1 Sep 2019 17:57:50 +0200 Subject: [PATCH 210/624] thinkpad: emulate wheel for a trackpoint by default Most trackpoint users I know use the middle-button to have some scrolling functionality. So I think that for ThinkPads at least we should have this enabled by default if the trackpoint shall be used. --- lenovo/thinkpad/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix index ff22639b4fdc..99d4937e49c7 100644 --- a/lenovo/thinkpad/default.nix +++ b/lenovo/thinkpad/default.nix @@ -1,9 +1,10 @@ -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ ../../common/pc/laptop ]; hardware.trackpoint.enable = lib.mkDefault true; + hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable; # Fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) # services.fprintd.enable = true; From abca8d018021bb03faf3507fb99e855801dffba0 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 1 Sep 2019 17:58:15 +0200 Subject: [PATCH 211/624] thinkpad/x1/6th-gen: fix trackpoint name Newer ThinkPads have a new name for the Trackpoint - "TPPS/2 Elan TrackPoint". Having the "[...] IBM Trackpoint" as default caused some weird side-effects on my machine (e.g. stopped the trackpoint working after a suspend) with the wrong name. Although this is mentioned in the option's description[1], I think that this should be declared explicitly here. As soon, as we supported newer models as well[2], we should probably move this into its own common profile. [1] https://nixos.org/nixos/options.html#hardware.trackpoint.device [2] https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/ --- lenovo/thinkpad/x1/6th-gen/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 295c8b0b43a6..e8c6f0e2651a 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -12,4 +12,8 @@ ../../../../common/pc/laptop/acpi_call.nix ../../../../common/pc/laptop/cpu-throttling-bug.nix ]; + + # New ThinkPads have a different TrackPoint manufacturer/name. + # See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/ + hardware.trackpoint.device = "TPPS/2 Elan TrackPoint"; } From 9e7fffdd5b8018c88c63e41387514cb0b8777aa7 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Mon, 2 Sep 2019 19:11:30 +0200 Subject: [PATCH 212/624] Add better pulseaudio support for thinkpad t490 --- lenovo/thinkpad/t490/default.nix | 30 ++++++ lenovo/thinkpad/t490/t490-profile-set.conf | 107 +++++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 lenovo/thinkpad/t490/default.nix create mode 100644 lenovo/thinkpad/t490/t490-profile-set.conf diff --git a/lenovo/thinkpad/t490/default.nix b/lenovo/thinkpad/t490/default.nix new file mode 100644 index 000000000000..e795aa7cc434 --- /dev/null +++ b/lenovo/thinkpad/t490/default.nix @@ -0,0 +1,30 @@ +{ nixos, pkgs, config, stdenv, ... }: +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ../../../common/pc/laptop/cpu-throttling-bug.nix + ../. + ]; + + services = { + # This fixes the pulseaudio profiles of the Thinkpad T490. + # The laptop contains a single audio card with 5 sub-devices. Default pulseaudio only offers a single sink + # which can only be switched between speaker/HDMI via a manual profile change. + # This configures a profile set for pulseaudio which offers multiple sinks corresponding to the + # speaker + 4 HDMI ports. This allows the user to play audio streams on the speaker and any of the 4 HDMI/USB-C + # ports at the same time. + udev.extraRules = let + t490ProfileSet = ./t490-profile-set.conf; + in '' + SUBSYSTEM!="sound", GOTO="pulseaudio_end" + ACTION!="change", GOTO="pulseaudio_end" + KERNEL!="card*", GOTO="pulseaudio_end" + + # Lenovo T490 + ATTRS{subsystem_vendor}=="0x17aa", ATTRS{subsystem_device}=="0x2279", ENV{PULSE_PROFILE_SET}="${t490ProfileSet}" + + LABEL="pulseaudio_end" + ''; + }; +} diff --git a/lenovo/thinkpad/t490/t490-profile-set.conf b/lenovo/thinkpad/t490/t490-profile-set.conf new file mode 100644 index 000000000000..98f8f0318de1 --- /dev/null +++ b/lenovo/thinkpad/t490/t490-profile-set.conf @@ -0,0 +1,107 @@ +[Profile speaker+hdmi-stereo] +description = Speaker + HDMI Stereo +output-mappings = analog-stereo hdmi-stereo hdmi-stereo-extra1 hdmi-stereo-extra2 +input-mappings = analog-stereo + +[Mapping analog-stereo] +device-strings = front:%f +channel-map = left,right +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 +paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic +priority = 15 + +[Mapping hdmi-stereo] +description = Stereo (HDMI) +device-strings = hdmi:%f +paths-output = hdmi-output-0 +channel-map = left,right +priority = 6 +direction = output + +[Mapping hdmi-stereo-extra1] +description = Stereo (HDMI 2) +device-strings = hdmi:%f,1 +paths-output = hdmi-output-1 +channel-map = left,right +priority = 8 +direction = output + +[Mapping hdmi-stereo-extra2] +description = Stereo (HDMI 3) +device-strings = hdmi:%f,2 +paths-output = hdmi-output-2 +channel-map = left,right +priority = 6 +direction = output + +[Profile speaker+hdmi-surround] +description = Speaker + HDMI 5.1 +output-mappings = analog-stereo hdmi-surround hdmi-surround-extra1 hdmi-surround-extra2 +input-mappings = analog-stereo + +[Mapping analog-stereo] +device-strings = front:%f +channel-map = left,right +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 +paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic +priority = 15 + +[Mapping hdmi-surround] +description = Digital Surround 5.1 (HDMI) +device-strings = hdmi:%f +paths-output = hdmi-output-0 +channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe +priority = 6 +direction = output + +[Mapping hdmi-surround-extra1] +description = Digital Surround 5.1 (HDMI 2) +device-strings = hdmi:%f,1 +paths-output = hdmi-output-1 +channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe +priority = 8 +direction = output + +[Mapping hdmi-surround-extra2] +description = Digital Surround 5.1 (HDMI 3) +device-strings = hdmi:%f,2 +paths-output = hdmi-output-2 +channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe +priority = 6 +direction = output + +[Profile speaker+hdmi-surround71] +description = Speaker + HDMI 7.1 +output-mappings = analog-stereo hdmi-surround71 hdmi-surround71-extra1 hdmi-surround71-extra2 +input-mappings = analog-stereo + +[Mapping analog-stereo] +device-strings = front:%f +channel-map = left,right +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 +paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic +priority = 15 + +[Mapping hdmi-surround71] +description = Digital Surround 7.1 (HDMI) +device-strings = hdmi:%f +paths-output = hdmi-output-0 +channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right +priority = 6 +direction = output + +[Mapping hdmi-surround71-extra1] +description = Digital Surround 7.1 (HDMI 2) +device-strings = hdmi:%f,1 +paths-output = hdmi-output-1 +channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right +priority = 8 +direction = output + +[Mapping hdmi-surround71-extra2] +description = Digital Surround 7.1 (HDMI 3) +device-strings = hdmi:%f,2 +paths-output = hdmi-output-2 +channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right +priority = 6 +direction = output From e338e4ee16d63c4f1298e204e0db5b8185d88f03 Mon Sep 17 00:00:00 2001 From: SRGOM Date: Tue, 3 Sep 2019 00:47:25 -0600 Subject: [PATCH 213/624] Update README.md At first (till third glance) I thought only the listed profiles are supported --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fbe9ff601861..81d495d671e7 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,9 @@ imports = [ ]; ``` -## Profiles +## Incomplete list of Profiles + +See code for all available configurations. | Model | Path | | --------------------------------- | -------------------------------------------- | From 5932cef1b9a45f97c5846f376a4252c49adf7a27 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Tue, 3 Sep 2019 20:08:01 +0200 Subject: [PATCH 214/624] update readme for T490 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fbe9ff601861..66ccdf70b733 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ imports = [ | Lenovo ThinkPad T460s | `` | | Lenovo ThinkPad T470s | `` | | Lenovo ThinkPad T480s | `` | +| Lenovo ThinkPad T490 | `` | | Lenovo ThinkPad X140e | `` | | Lenovo ThinkPad X220 | `` | | Lenovo ThinkPad X230 | `` | From 83ca0c4e6b587240fef055e31cca5ef6fdd94761 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 4 Sep 2019 22:36:27 +0200 Subject: [PATCH 215/624] thinkpad/x250: add acpi_call This kernel module is needed to, for example, support tlp's - `START_CHARGE_THRESH_BAT?` and - `STOP_CHARGE_THRESH_BAT?` options. --- lenovo/thinkpad/x250/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lenovo/thinkpad/x250/default.nix b/lenovo/thinkpad/x250/default.nix index 870d9a857742..55ae2096342e 100644 --- a/lenovo/thinkpad/x250/default.nix +++ b/lenovo/thinkpad/x250/default.nix @@ -2,5 +2,6 @@ imports = [ ../. ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix ]; } From 26bbc980b9b7c6b0d38b51fec5b41e977731fb5c Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Sun, 15 Jul 2018 22:28:25 +0100 Subject: [PATCH 216/624] Add Dell E7240 Profile (Current XPS 15 works well) --- README.md | 82 ++++++++++++++++++++++-------------------- dell/e7240/README.md | 8 +++++ dell/e7240/default.nix | 8 +++++ release.nix | 1 + 4 files changed, 60 insertions(+), 39 deletions(-) create mode 100644 dell/e7240/README.md create mode 100644 dell/e7240/default.nix diff --git a/README.md b/README.md index bd57ba341ad1..e852161028f5 100644 --- a/README.md +++ b/README.md @@ -24,48 +24,52 @@ imports = [ See code for all available configurations. -| Model | Path | -| --------------------------------- | -------------------------------------------- | -| [Acer Aspire 4810T][] | `` | -| Airis N990 | `` | -| Apple MacBook Air 4,X | `` | -| Apple MacBook Air 6,X | `` | -| [Apple MacBook Pro 10,1][] | `` | -| Apple MacBook Pro 12,1 | `` | -| BeagleBoard PocketBeagle | `` | -| [Dell XPS 13 9360][] | `` | -| [Dell XPS 13 9370][] | `` | -| [Dell XPS 13 9380][] | `` | -| [Dell XPS 15 9550][] | `` | -| [Inverse Path USB armory][] | `` | -| Lenovo IdeaPad Z510 | `` | -| Lenovo ThinkPad T410 | `` | -| Lenovo ThinkPad T430 | `` | -| Lenovo ThinkPad T440s | `` | -| Lenovo ThinkPad T440p | `` | -| Lenovo ThinkPad T450s | `` | -| Lenovo ThinkPad T460s | `` | -| Lenovo ThinkPad T470s | `` | -| Lenovo ThinkPad T480s | `` | -| Lenovo ThinkPad T490 | `` | -| Lenovo ThinkPad X140e | `` | -| Lenovo ThinkPad X220 | `` | -| Lenovo ThinkPad X230 | `` | -| Lenovo ThinkPad X250 | `` | -| [Lenovo ThinkPad X260][] | `` | -| Lenovo ThinkPad X270 | `` | -| [Lenovo ThinkPad X1 (6th Gen)][] | ``| -| [Microsoft Surface Pro 3][] | `` | -| PC Engines APU | `` | -| [Raspberry Pi 2][] | `` | -| [Samsung Series 9 NP900X3C][] | `` | -| [Purism Librem 13v3][] | `` | -| Supermicro A1SRi-2758F | `` | -| Supermicro X10SLL-F | `` | -| [Toshiba Chromebook 2 `swanky`][] | `` | + + +| Model | Path | +| --------------------------------- | -------------------------------------------- | +| [Acer Aspire 4810T][] | `` | +| Airis N990 | `` | +| Apple MacBook Air 4,X | `` | +| Apple MacBook Air 6,X | `` | +| [Apple MacBook Pro 10,1][] | `` | +| Apple MacBook Pro 12,1 | `` | +| BeagleBoard PocketBeagle | `` | +| [Dell XPS E7240][] | `` | +| [Dell XPS 13 9360][] | `` | +| [Dell XPS 13 9370][] | `` | +| [Dell XPS 13 9380][] | `` | +| [Dell XPS 15 9550][] | `` | +| [Inverse Path USB armory][] | `` | +| Lenovo IdeaPad Z510 | `` | +| Lenovo ThinkPad T410 | `` | +| Lenovo ThinkPad T430 | `` | +| Lenovo ThinkPad T440s | `` | +| Lenovo ThinkPad T440p | `` | +| Lenovo ThinkPad T450s | `` | +| Lenovo ThinkPad T460s | `` | +| Lenovo ThinkPad T470s | `` | +| Lenovo ThinkPad T480s | `` | +| Lenovo ThinkPad T490 | `` | +| Lenovo ThinkPad X140e | `` | +| Lenovo ThinkPad X220 | `` | +| Lenovo ThinkPad X230 | `` | +| Lenovo ThinkPad X250 | `` | +| [Lenovo ThinkPad X260][] | `` | +| Lenovo ThinkPad X270 | `` | +| [Lenovo ThinkPad X1 (6th Gen)][] | `` | +| [Microsoft Surface Pro 3][] | `` | +| PC Engines APU | `` | +| [Raspberry Pi 2][] | `` | +| [Samsung Series 9 NP900X3C][] | `` | +| [Purism Librem 13v3][] | `` | +| Supermicro A1SRi-2758F | `` | +| Supermicro X10SLL-F | `` | +| [Toshiba Chromebook 2 `swanky`][] | `` | [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 +[Dell XPS E7240][]: dell/e7240 [Dell XPS 13 9360]: dell/xps/13-9360 [Dell XPS 13 9370]: dell/xps/13-9370 [Dell XPS 13 9380]: dell/xps/13-9380 diff --git a/dell/e7240/README.md b/dell/e7240/README.md new file mode 100644 index 000000000000..b712f4d2bc25 --- /dev/null +++ b/dell/e7240/README.md @@ -0,0 +1,8 @@ +On some kernel versions user ashgillman has experiences suspend issues +(see https://bugzilla.redhat.com/show_bug.cgi?id=1597481). + +Try: + +```nix +boot.kernelPackages = pkgs.linuxPackages_4_14; +``` diff --git a/dell/e7240/default.nix b/dell/e7240/default.nix new file mode 100644 index 000000000000..3334a745f8c3 --- /dev/null +++ b/dell/e7240/default.nix @@ -0,0 +1,8 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../common/cpu/intel + ../../common/pc/laptop + ]; +} diff --git a/release.nix b/release.nix index 11ba88831fab..ecc3ec717241 100644 --- a/release.nix +++ b/release.nix @@ -31,6 +31,7 @@ in apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5; apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1; + dell-e7240 = buildProfile ./dell/e7240; dell-xps-13-9380 = buildProfile ./dell/xps/13-9380; dell-xps-13-9370 = buildProfile ./dell/xps/13-9370; dell-xps-15-9550 = buildProfile ./dell/xps/15-9550; From de600352bc4ba2c5ae3dd62a472b54be99d6bfc4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 28 Sep 2019 23:58:20 +0200 Subject: [PATCH 217/624] thinkpad/x1-extreme/gen2: add module --- README.md | 79 +++++++++++---------- lenovo/thinkpad/x1-extreme/default.nix | 8 +++ lenovo/thinkpad/x1-extreme/gen2/default.nix | 47 ++++++++++++ 3 files changed, 95 insertions(+), 39 deletions(-) create mode 100644 lenovo/thinkpad/x1-extreme/default.nix create mode 100644 lenovo/thinkpad/x1-extreme/gen2/default.nix diff --git a/README.md b/README.md index bd57ba341ad1..be6cdde53336 100644 --- a/README.md +++ b/README.md @@ -24,45 +24,46 @@ imports = [ See code for all available configurations. -| Model | Path | -| --------------------------------- | -------------------------------------------- | -| [Acer Aspire 4810T][] | `` | -| Airis N990 | `` | -| Apple MacBook Air 4,X | `` | -| Apple MacBook Air 6,X | `` | -| [Apple MacBook Pro 10,1][] | `` | -| Apple MacBook Pro 12,1 | `` | -| BeagleBoard PocketBeagle | `` | -| [Dell XPS 13 9360][] | `` | -| [Dell XPS 13 9370][] | `` | -| [Dell XPS 13 9380][] | `` | -| [Dell XPS 15 9550][] | `` | -| [Inverse Path USB armory][] | `` | -| Lenovo IdeaPad Z510 | `` | -| Lenovo ThinkPad T410 | `` | -| Lenovo ThinkPad T430 | `` | -| Lenovo ThinkPad T440s | `` | -| Lenovo ThinkPad T440p | `` | -| Lenovo ThinkPad T450s | `` | -| Lenovo ThinkPad T460s | `` | -| Lenovo ThinkPad T470s | `` | -| Lenovo ThinkPad T480s | `` | -| Lenovo ThinkPad T490 | `` | -| Lenovo ThinkPad X140e | `` | -| Lenovo ThinkPad X220 | `` | -| Lenovo ThinkPad X230 | `` | -| Lenovo ThinkPad X250 | `` | -| [Lenovo ThinkPad X260][] | `` | -| Lenovo ThinkPad X270 | `` | -| [Lenovo ThinkPad X1 (6th Gen)][] | ``| -| [Microsoft Surface Pro 3][] | `` | -| PC Engines APU | `` | -| [Raspberry Pi 2][] | `` | -| [Samsung Series 9 NP900X3C][] | `` | -| [Purism Librem 13v3][] | `` | -| Supermicro A1SRi-2758F | `` | -| Supermicro X10SLL-F | `` | -| [Toshiba Chromebook 2 `swanky`][] | `` | +| Model | Path | +| --------------------------------- | -------------------------------------------------- | +| [Acer Aspire 4810T][] | `` | +| Airis N990 | `` | +| Apple MacBook Air 4,X | `` | +| Apple MacBook Air 6,X | `` | +| [Apple MacBook Pro 10,1][] | `` | +| Apple MacBook Pro 12,1 | `` | +| BeagleBoard PocketBeagle | `` | +| [Dell XPS 13 9360][] | `` | +| [Dell XPS 13 9370][] | `` | +| [Dell XPS 13 9380][] | `` | +| [Dell XPS 15 9550][] | `` | +| [Inverse Path USB armory][] | `` | +| Lenovo IdeaPad Z510 | `` | +| Lenovo ThinkPad T410 | `` | +| Lenovo ThinkPad T430 | `` | +| Lenovo ThinkPad T440s | `` | +| Lenovo ThinkPad T440p | `` | +| Lenovo ThinkPad T450s | `` | +| Lenovo ThinkPad T460s | `` | +| Lenovo ThinkPad T470s | `` | +| Lenovo ThinkPad T480s | `` | +| Lenovo ThinkPad T490 | `` | +| Lenovo ThinkPad X140e | `` | +| Lenovo ThinkPad X220 | `` | +| Lenovo ThinkPad X230 | `` | +| Lenovo ThinkPad X250 | `` | +| [Lenovo ThinkPad X260][] | `` | +| Lenovo ThinkPad X270 | `` | +| [Lenovo ThinkPad X1 (6th Gen)][] | `` | +| Lenovo ThinkPad X1 Extreme Gen 2 | `` | +| [Microsoft Surface Pro 3][] | `` | +| PC Engines APU | `` | +| [Raspberry Pi 2][] | `` | +| [Samsung Series 9 NP900X3C][] | `` | +| [Purism Librem 13v3][] | `` | +| Supermicro A1SRi-2758F | `` | +| Supermicro X10SLL-F | `` | +| [Toshiba Chromebook 2 `swanky`][] | `` | [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 diff --git a/lenovo/thinkpad/x1-extreme/default.nix b/lenovo/thinkpad/x1-extreme/default.nix new file mode 100644 index 000000000000..09a0ec1700a5 --- /dev/null +++ b/lenovo/thinkpad/x1-extreme/default.nix @@ -0,0 +1,8 @@ +{ + imports = [ + ../. + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ../../../common/pc/laptop/ssd + ]; +} diff --git a/lenovo/thinkpad/x1-extreme/gen2/default.nix b/lenovo/thinkpad/x1-extreme/gen2/default.nix new file mode 100644 index 000000000000..912cc950cabf --- /dev/null +++ b/lenovo/thinkpad/x1-extreme/gen2/default.nix @@ -0,0 +1,47 @@ +{ config, lib, ... }: + +with lib; + +{ + imports = [ + ../. + ../../../../common/pc/laptop/cpu-throttling-bug.nix + ]; + + # Fixes an issue with incorrect battery reporting. See + # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Extreme_(Gen_2)#Invalid_Stats_Workaround + boot.initrd.availableKernelModules = [ "battery" ]; + + # New ThinkPads have a different TrackPoint manufacturer/name. + # See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/ + hardware.trackpoint.device = "TPPS/2 Elan TrackPoint"; + + # Since the HDMI port is connected to the NVIDIA card. + hardware.bumblebee.connectDisplay = true; + + nixpkgs.overlays = [ + (self: super: { + bumblebee = super.bumblebee.override { + extraNvidiaDeviceOptions = '' + Option "AllowEmptyInitialConfiguration" + ''; + }; + }) + ]; + + services.xserver = mkMerge [ + { + # Set the right DPI. xdpyinfo says the screen is 508×285 mm but + # it actually is 344×193 mm. + monitorSection = '' + DisplaySize 344 193 + ''; + } + + # To support intel-virtual-output when using Bumblebee. + (mkIf config.hardware.bumblebee.enable { + deviceSection = ''Option "VirtualHeads" "1"''; + videoDrivers = [ "intel" ]; + }) + ]; +} From b60ea643a4db066d48f7bdc08689a1fe6eacf348 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Fri, 4 Oct 2019 19:27:28 +0200 Subject: [PATCH 218/624] match specifically on the sound chip --- lenovo/thinkpad/t490/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/t490/default.nix b/lenovo/thinkpad/t490/default.nix index e795aa7cc434..1a4f71dfc20c 100644 --- a/lenovo/thinkpad/t490/default.nix +++ b/lenovo/thinkpad/t490/default.nix @@ -22,7 +22,7 @@ KERNEL!="card*", GOTO="pulseaudio_end" # Lenovo T490 - ATTRS{subsystem_vendor}=="0x17aa", ATTRS{subsystem_device}=="0x2279", ENV{PULSE_PROFILE_SET}="${t490ProfileSet}" + ATTRS{vendor}=="0x8086" ATTRS{device}=="0x9dc8" ATTRS{subsystem_vendor}=="0x17aa", ATTRS{subsystem_device}=="0x2279", ENV{PULSE_PROFILE_SET}="${t490ProfileSet}" LABEL="pulseaudio_end" ''; From d94273063433fcad2af2d0c36b6a938598846887 Mon Sep 17 00:00:00 2001 From: Adam Sandberg Eriksson Date: Wed, 16 Oct 2019 15:05:55 +0100 Subject: [PATCH 219/624] Fix readme markdown syntax --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e0e061c21e34..e16e6e4e436e 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ See code for all available configurations. [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 -[Dell XPS E7240][]: dell/e7240 +[Dell XPS E7240]: dell/e7240 [Dell XPS 13 9360]: dell/xps/13-9360 [Dell XPS 13 9370]: dell/xps/13-9370 [Dell XPS 13 9380]: dell/xps/13-9380 From ed0d3cc198557b9260295aa8a384dd5080706aee Mon Sep 17 00:00:00 2001 From: *Kim Zick Date: Wed, 16 Oct 2019 14:25:20 -0400 Subject: [PATCH 220/624] Initial p53 hardware configuration (#125) --- README.md | 1 + lenovo/thinkpad/p53/default.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 lenovo/thinkpad/p53/default.nix diff --git a/README.md b/README.md index e16e6e4e436e..4cfbf534c592 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ See code for all available configurations. | [Dell XPS 15 9550][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | +| Lenovo ThinkPad P53 | `` | | Lenovo ThinkPad T410 | `` | | Lenovo ThinkPad T430 | `` | | Lenovo ThinkPad T440s | `` | diff --git a/lenovo/thinkpad/p53/default.nix b/lenovo/thinkpad/p53/default.nix new file mode 100644 index 000000000000..6eadb6ec84da --- /dev/null +++ b/lenovo/thinkpad/p53/default.nix @@ -0,0 +1,9 @@ +{ nixos, pkgs, config, stdenv, ... }: +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ../../../common/pc/laptop/cpu-throttling-bug.nix + ../. + ]; +} From 2bf94227c1efbf47e99f55dacd799fffe87207e8 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Fri, 19 Jul 2019 11:03:36 +0100 Subject: [PATCH 221/624] Replace ad hoc throttling fix with throttled `throttled` is a service designed to fix the same CPU throttling bug, but it's an actively maintainted upstream project that we can use. --- common/pc/laptop/cpu-throttling-bug.nix | 38 --------------------- dell/xps/13-9370/default.nix | 3 +- lenovo/thinkpad/p53/default.nix | 5 +-- lenovo/thinkpad/t480s/default.nix | 3 +- lenovo/thinkpad/t490/default.nix | 5 +-- lenovo/thinkpad/x1-extreme/gen2/default.nix | 3 +- lenovo/thinkpad/x1/6th-gen/default.nix | 5 +-- 7 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 common/pc/laptop/cpu-throttling-bug.nix diff --git a/common/pc/laptop/cpu-throttling-bug.nix b/common/pc/laptop/cpu-throttling-bug.nix deleted file mode 100644 index 7f3caa2b2d82..000000000000 --- a/common/pc/laptop/cpu-throttling-bug.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ config, pkgs, ... }: -{ - # Temporary fix for cpu throttling issues visible in the kernel log - # (journalctl -k) by setting the same temperature limits used by - # Window$ - # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues - systemd.services.cpu-throttling = { - enable = true; - description = "CPU Throttling Fix"; - documentation = [ - "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" - ]; - path = [ pkgs.msr-tools ]; - script = "wrmsr -a 0x1a2 0x3000000"; - serviceConfig = { - Type = "oneshot"; - }; - wantedBy = [ - "timers.target" - ]; - }; - - systemd.timers.cpu-throttling = { - enable = true; - description = "CPU Throttling Fix"; - documentation = [ - "https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Power_management.2FThrottling_issues" - ]; - timerConfig = { - OnActiveSec = 60; - OnUnitActiveSec = 60; - Unit = "cpu-throttling.service"; - }; - wantedBy = [ - "timers.target" - ]; - }; -} diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix index cd53acd02fc0..609aebfadf4a 100644 --- a/dell/xps/13-9370/default.nix +++ b/dell/xps/13-9370/default.nix @@ -5,7 +5,6 @@ ../../../common/cpu/intel/kaby-lake ../../../common/pc/laptop ../../../common/pc/laptop/acpi_call.nix - ../../../common/pc/laptop/cpu-throttling-bug.nix ]; # Force S3 sleep mode. See README.wiki for details. @@ -13,4 +12,6 @@ # touchpad goes over i2c boot.blacklistedKernelModules = [ "psmouse" ]; + + services.throttled.enable = lib.mkDefault true; } diff --git a/lenovo/thinkpad/p53/default.nix b/lenovo/thinkpad/p53/default.nix index 6eadb6ec84da..a499d5c2d51e 100644 --- a/lenovo/thinkpad/p53/default.nix +++ b/lenovo/thinkpad/p53/default.nix @@ -1,9 +1,10 @@ -{ nixos, pkgs, config, stdenv, ... }: +{ nixos, pkgs, lib, config, stdenv, ... }: { imports = [ ../../../common/cpu/intel ../../../common/pc/laptop/acpi_call.nix - ../../../common/pc/laptop/cpu-throttling-bug.nix ../. ]; + + services.throttled.enable = lib.mkDefault true; } diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix index 3e079d5fb060..1a14afa6b5e4 100644 --- a/lenovo/thinkpad/t480s/default.nix +++ b/lenovo/thinkpad/t480s/default.nix @@ -4,7 +4,8 @@ imports = [ ../../../common/cpu/intel ../../../common/pc/laptop/acpi_call.nix - ../../../common/pc/laptop/cpu-throttling-bug.nix ../. ]; + + services.throttled.enable = lib.mkDefault true; } diff --git a/lenovo/thinkpad/t490/default.nix b/lenovo/thinkpad/t490/default.nix index 1a4f71dfc20c..3578da66c73d 100644 --- a/lenovo/thinkpad/t490/default.nix +++ b/lenovo/thinkpad/t490/default.nix @@ -1,9 +1,8 @@ -{ nixos, pkgs, config, stdenv, ... }: +{ nixos, lib, pkgs, config, stdenv, ... }: { imports = [ ../../../common/cpu/intel ../../../common/pc/laptop/acpi_call.nix - ../../../common/pc/laptop/cpu-throttling-bug.nix ../. ]; @@ -26,5 +25,7 @@ LABEL="pulseaudio_end" ''; + + throttled.enable = lib.mkDefault true; }; } diff --git a/lenovo/thinkpad/x1-extreme/gen2/default.nix b/lenovo/thinkpad/x1-extreme/gen2/default.nix index 912cc950cabf..6b0ebbd5d1e3 100644 --- a/lenovo/thinkpad/x1-extreme/gen2/default.nix +++ b/lenovo/thinkpad/x1-extreme/gen2/default.nix @@ -5,7 +5,6 @@ with lib; { imports = [ ../. - ../../../../common/pc/laptop/cpu-throttling-bug.nix ]; # Fixes an issue with incorrect battery reporting. See @@ -44,4 +43,6 @@ with lib; videoDrivers = [ "intel" ]; }) ]; + + services.throttled.enable = lib.mkDefault true; } diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index e8c6f0e2651a..00446b8c278b 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -5,15 +5,16 @@ # # Enable the lower-power S3 suspend state by upgrading the BIOS to version >= 1.30, # then manually selecting Linux in the power management section. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ ../. ../../../../common/pc/laptop/acpi_call.nix - ../../../../common/pc/laptop/cpu-throttling-bug.nix ]; # New ThinkPads have a different TrackPoint manufacturer/name. # See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/ hardware.trackpoint.device = "TPPS/2 Elan TrackPoint"; + + services.throttled.enable = lib.mkDefault true; } From 4916acd221241d9686a07075b69986a03a1c564d Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Sun, 27 Oct 2019 09:02:50 +0100 Subject: [PATCH 222/624] dell/xps: enable thermald service --- dell/xps/13-9360/default.nix | 5 ++++- dell/xps/13-9370/default.nix | 3 +++ dell/xps/13-9380/default.nix | 3 +++ dell/xps/15-9550/default.nix | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix index e13e758d44c7..5ff1e54a46b6 100644 --- a/dell/xps/13-9360/default.nix +++ b/dell/xps/13-9360/default.nix @@ -13,7 +13,7 @@ efi.canTouchEfiVariables = lib.mkDefault true; systemd-boot.enable = lib.mkDefault true; }; - + hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ]; # TODO: move to general HiDPI profile @@ -23,4 +23,7 @@ nixpkgs.overlays = [(final: previous: { qca6174-firmware = final.callPackage ./qca6174-firmware.nix {}; })]; + + # This will save you money and possibly your life! + services.thermald.enable = true; } diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix index 609aebfadf4a..dbe852f0c27f 100644 --- a/dell/xps/13-9370/default.nix +++ b/dell/xps/13-9370/default.nix @@ -14,4 +14,7 @@ boot.blacklistedKernelModules = [ "psmouse" ]; services.throttled.enable = lib.mkDefault true; + + # This will save you money and possibly your life! + services.thermald.enable = true; } diff --git a/dell/xps/13-9380/default.nix b/dell/xps/13-9380/default.nix index d04f50449970..162cc2618eb1 100644 --- a/dell/xps/13-9380/default.nix +++ b/dell/xps/13-9380/default.nix @@ -12,4 +12,7 @@ # touchpad goes over i2c boot.blacklistedKernelModules = [ "psmouse" ]; + + # This will save you money and possibly your life! + services.thermald.enable = true; } diff --git a/dell/xps/15-9550/default.nix b/dell/xps/15-9550/default.nix index 90cfc6e2936a..9677972a6b70 100644 --- a/dell/xps/15-9550/default.nix +++ b/dell/xps/15-9550/default.nix @@ -10,6 +10,9 @@ boot.loader.systemd-boot.enable = lib.mkDefault true; boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + # This will save you money and possibly your life! + services.thermald.enable = true; + # To just use Intel integrated graphics with Intel's open source driver # hardware.nvidiaOptimus.disable = true; } From 5316e919c8e01dcff9c64c8aa3f8947e9d07680d Mon Sep 17 00:00:00 2001 From: Alexander Berlind Date: Wed, 30 Oct 2019 20:15:22 +0100 Subject: [PATCH 223/624] Add Dell XPS-7390 Profile (#128) --- README.md | 2 ++ dell/xps/13-7390/README.wiki | 12 ++++++++++++ dell/xps/13-7390/default.nix | 11 +++++++++++ 3 files changed, 25 insertions(+) create mode 100644 dell/xps/13-7390/README.wiki create mode 100644 dell/xps/13-7390/default.nix diff --git a/README.md b/README.md index 4cfbf534c592..648f1295c93e 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ See code for all available configurations. | Apple MacBook Pro 12,1 | `` | | BeagleBoard PocketBeagle | `` | | [Dell XPS E7240][] | `` | +| [Dell XPS 13 7390][] | `` | | [Dell XPS 13 9360][] | `` | | [Dell XPS 13 9370][] | `` | | [Dell XPS 13 9380][] | `` | @@ -70,6 +71,7 @@ See code for all available configurations. [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 [Dell XPS E7240]: dell/e7240 +[Dell XPS 13 7390]: dell/xps/13-7390 [Dell XPS 13 9360]: dell/xps/13-9360 [Dell XPS 13 9370]: dell/xps/13-9370 [Dell XPS 13 9380]: dell/xps/13-9380 diff --git a/dell/xps/13-7390/README.wiki b/dell/xps/13-7390/README.wiki new file mode 100644 index 000000000000..c5eac594576f --- /dev/null +++ b/dell/xps/13-7390/README.wiki @@ -0,0 +1,12 @@ += Dell XPS 13 7390 = + +== Firmware upgrades == + +Note that this device is supported by [https://fwupd.org/ fwupd]. +To perform firmware upgrades just activate the service + + +services.fwupd.enable = true; + + +Then use fwupdmgr to perform updates. diff --git a/dell/xps/13-7390/default.nix b/dell/xps/13-7390/default.nix new file mode 100644 index 000000000000..727ea5c9e57f --- /dev/null +++ b/dell/xps/13-7390/default.nix @@ -0,0 +1,11 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop + ../../../common/pc/laptop/ssd + ]; + + services.thermald.enable = true; +} From 5575153e2d96efc8caadfc46989b11c6e64454a4 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sat, 2 Nov 2019 12:52:58 +0200 Subject: [PATCH 224/624] Add Lenovo ThinkPad T420 profile --- README.md | 1 + lenovo/thinkpad/t420/default.nix | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 lenovo/thinkpad/t420/default.nix diff --git a/README.md b/README.md index 648f1295c93e..f5b1268f9ecc 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ See code for all available configurations. | Lenovo IdeaPad Z510 | `` | | Lenovo ThinkPad P53 | `` | | Lenovo ThinkPad T410 | `` | +| Lenovo ThinkPad T420 | `` | | Lenovo ThinkPad T430 | `` | | Lenovo ThinkPad T440s | `` | | Lenovo ThinkPad T440p | `` | diff --git a/lenovo/thinkpad/t420/default.nix b/lenovo/thinkpad/t420/default.nix new file mode 100644 index 000000000000..5d3efe831c96 --- /dev/null +++ b/lenovo/thinkpad/t420/default.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../. + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ]; +} From 19b4d5cede55b4a90354890b9e9c82232332c279 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sat, 26 Oct 2019 14:21:36 +0200 Subject: [PATCH 225/624] intel: add intel-media-driver Provides hardware accelerated video playback from Broadwell onwards. --- common/cpu/intel/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/common/cpu/intel/default.nix b/common/cpu/intel/default.nix index 7f2223c72e40..ad945f394a6c 100644 --- a/common/cpu/intel/default.nix +++ b/common/cpu/intel/default.nix @@ -10,5 +10,6 @@ vaapiIntel vaapiVdpau libvdpau-va-gl + intel-media-driver ]; } From adecd1113c2d4137ef23237f9af450736fd8d2cc Mon Sep 17 00:00:00 2001 From: ilian Date: Tue, 12 Nov 2019 10:36:10 +0000 Subject: [PATCH 226/624] apple: Add support for MacBook Air 3,X (#91) --- README.md | 1 + apple/macbook-air/3/default.nix | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 apple/macbook-air/3/default.nix diff --git a/README.md b/README.md index f5b1268f9ecc..d82ef1c5d083 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ See code for all available configurations. | --------------------------------- | -------------------------------------------------- | | [Acer Aspire 4810T][] | `` | | Airis N990 | `` | +| Apple MacBook Air 3,X | `` | | Apple MacBook Air 4,X | `` | | Apple MacBook Air 6,X | `` | | [Apple MacBook Pro 10,1][] | `` | diff --git a/apple/macbook-air/3/default.nix b/apple/macbook-air/3/default.nix new file mode 100644 index 000000000000..03221edcd0b0 --- /dev/null +++ b/apple/macbook-air/3/default.nix @@ -0,0 +1,15 @@ +{ config, lib, ... }: + +{ + imports = [ + ../../. + ../../../common/pc/laptop + ../../../common/pc/ssd + ]; + + # Built-in iSight is recognized by the generic uvcvideo kernel module + hardware.facetimehd.enable = false; + + hardware.cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; +} From c97f57ef9623e05dfabbbce573c311610e1d3932 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 19 Nov 2019 22:23:14 +0000 Subject: [PATCH 227/624] gobi_loader: init at 0.7 --- .../os-specific/linux/gobi_loader/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/os-specific/linux/gobi_loader/default.nix diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/os-specific/linux/gobi_loader/default.nix new file mode 100644 index 000000000000..3482e22aa598 --- /dev/null +++ b/pkgs/os-specific/linux/gobi_loader/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "gobi_loader"; + version = "0.7"; + + src = fetchurl { + url = "https://www.codon.org.uk/~mjg59/gobi_loader/download/${pname}-${version}.tar.gz"; + sha256 = "0jkmpqkiddpxrzl2s9s3kh64ha48m00nn53f82m1rphw8maw5gbq"; + }; + + makeFlags = "prefix=${placeholder "out"}"; + + meta = with stdenv.lib; { + description = "Firmware loader for Qualcomm Gobi USB chipsets"; + homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ "0x4A6F" ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83a183e36719..33aa3c665c59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15802,6 +15802,8 @@ in fwts = callPackage ../os-specific/linux/fwts { }; + gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; + libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; libuuid = if stdenv.isLinux From c7bf1e2a01ae4075b00f66b8dc94576493231fe1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 24 Nov 2019 18:13:21 +0100 Subject: [PATCH 228/624] gobi_loader: patch udev rules to gobi_loader binary and update firmware path --- pkgs/os-specific/linux/gobi_loader/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/os-specific/linux/gobi_loader/default.nix index 3482e22aa598..5c605de3331b 100644 --- a/pkgs/os-specific/linux/gobi_loader/default.nix +++ b/pkgs/os-specific/linux/gobi_loader/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0jkmpqkiddpxrzl2s9s3kh64ha48m00nn53f82m1rphw8maw5gbq"; }; + postPatch = '' + substituteInPlace 60-gobi.rules --replace "gobi_loader" "${placeholder "out"}/lib/udev/gobi_loader" + substituteInPlace 60-gobi.rules --replace "/lib/firmware" "/run/current-system/firmware" + ''; + makeFlags = "prefix=${placeholder "out"}"; meta = with stdenv.lib; { From c3b2ac63ff06e5dd4fa66f75bfab7892b3edfdc5 Mon Sep 17 00:00:00 2001 From: Alexander Berlind Date: Sat, 28 Dec 2019 10:50:04 +0100 Subject: [PATCH 229/624] Add deepsleep to avoid wakeups during sleep mode (#136) --- dell/xps/13-7390/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dell/xps/13-7390/default.nix b/dell/xps/13-7390/default.nix index 727ea5c9e57f..991e4352cb50 100644 --- a/dell/xps/13-7390/default.nix +++ b/dell/xps/13-7390/default.nix @@ -7,5 +7,7 @@ ../../../common/pc/laptop/ssd ]; + boot.kernelParams = [ "mem_sleep_default=deep" ]; + services.thermald.enable = true; } From 1d746f22983f050af004a3ebca90651c2c6d1464 Mon Sep 17 00:00:00 2001 From: mishudark Date: Tue, 31 Dec 2019 12:43:42 +0100 Subject: [PATCH 230/624] Add Lenovo ThinkPad X280 profile --- README.md | 1 + lenovo/thinkpad/x280/default.nix | 12 ++++++++++++ release.nix | 1 + 3 files changed, 14 insertions(+) create mode 100644 lenovo/thinkpad/x280/default.nix diff --git a/README.md b/README.md index d82ef1c5d083..c86792e461e2 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,7 @@ See code for all available configurations. | Lenovo ThinkPad X250 | `` | | [Lenovo ThinkPad X260][] | `` | | Lenovo ThinkPad X270 | `` | +| Lenovo ThinkPad X280 | `` | | [Lenovo ThinkPad X1 (6th Gen)][] | `` | | Lenovo ThinkPad X1 Extreme Gen 2 | `` | | [Microsoft Surface Pro 3][] | `` | diff --git a/lenovo/thinkpad/x280/default.nix b/lenovo/thinkpad/x280/default.nix new file mode 100644 index 000000000000..a9423e547321 --- /dev/null +++ b/lenovo/thinkpad/x280/default.nix @@ -0,0 +1,12 @@ +{ config, pkgs, lib, ... }: + +{ + imports = [ + ../. + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ../../../common/pc/laptop/ssd/default.nix + ]; + + services.throttled.enable = lib.mkDefault true; +} diff --git a/release.nix b/release.nix index ecc3ec717241..88abd260d756 100644 --- a/release.nix +++ b/release.nix @@ -45,6 +45,7 @@ in lenovo-thinkpad-x230 = buildProfile ./lenovo/thinkpad/x230; lenovo-thinkpad-x250 = buildProfile ./lenovo/thinkpad/x250; lenovo-thinkpad-x260 = buildProfile ./lenovo/thinkpad/x260; + lenovo-thinkpad-x280 = buildProfile ./lenovo/thinkpad/x280; microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3; From 6081bfd6d5d1a7f918aafb107f8e2b67b743b34a Mon Sep 17 00:00:00 2001 From: "*Kim Zick (rummik)" Date: Thu, 2 Jan 2020 11:35:56 -0500 Subject: [PATCH 231/624] Add Lenovo ThinkPad L13 profile --- lenovo/thinkpad/l13/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 lenovo/thinkpad/l13/default.nix diff --git a/lenovo/thinkpad/l13/default.nix b/lenovo/thinkpad/l13/default.nix new file mode 100644 index 000000000000..3c09f5091ed8 --- /dev/null +++ b/lenovo/thinkpad/l13/default.nix @@ -0,0 +1,10 @@ +{ nixos, lib, pkgs, config, stdenv, ... }: +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ../. + ]; + + services.throttled.enable = lib.mkDefault true; +} From c30e20594b35d610e1409fe3c60dd1193ad40767 Mon Sep 17 00:00:00 2001 From: *Kim Zick Date: Tue, 7 Jan 2020 10:04:52 -0500 Subject: [PATCH 232/624] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c86792e461e2..94ac173f4f80 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ See code for all available configurations. | [Dell XPS 15 9550][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | +| Lenovo ThinkPad L13 | `` | | Lenovo ThinkPad P53 | `` | | Lenovo ThinkPad T410 | `` | | Lenovo ThinkPad T420 | `` | From 814bd1a02422e7007fe469442c94f1ec54b065d6 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Thu, 18 Jul 2019 15:19:31 -0400 Subject: [PATCH 233/624] Initial 15-7590 --- dell/xps/15-7590/README.wiki | 46 ++++++++++++++++++++++++++++++++++++ dell/xps/15-7590/default.nix | 14 +++++++++++ 2 files changed, 60 insertions(+) create mode 100644 dell/xps/15-7590/README.wiki create mode 100644 dell/xps/15-7590/default.nix diff --git a/dell/xps/15-7590/README.wiki b/dell/xps/15-7590/README.wiki new file mode 100644 index 000000000000..b323b3171883 --- /dev/null +++ b/dell/xps/15-7590/README.wiki @@ -0,0 +1,46 @@ += Dell XPS 15 7590 = +*Mostly copied from 15-9550 + +== Tested Hardware == + +* CPU: Intel(R) Core(TM) i9-9980HK +* RAM: 32 GB +* HDD: 1 TiB SSD +* Screen: 15" 4k (3840✕2160) +* Input: Touchscreen and trackpad. + +== Firmware Configuration == + +Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. + +=== Before installation === + +These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. + +* ''Disable Secure Boot (but keep UEFI Boot).'' Thakfully doing so is as easy as changing any other simple setting. + +* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) + +=== Wifi === +Wifi does not work with kernels older than 5.1 (firmware not present) or newer (https://bbs.archlinux.org/viewtopic.php?id=247705) +``` + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.grub = { + device = "nodev"; + efiSupport = true; + efiInstallAsRemovable = true; + }; + boot.loader.efi.canTouchEfiVariables = true; + boot.kernelPackages = pkgs.linuxPackages_5_1; +``` +=== After installation === + +* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. + +=== Optional === + +* ''Update BIOS.'' According to Reddit, this helps with battery life. + +=== Troubleshooting === + diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix new file mode 100644 index 000000000000..a3540e7cf324 --- /dev/null +++ b/dell/xps/15-7590/default.nix @@ -0,0 +1,14 @@ +{ lib, ... }: + +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop + ]; + + # TODO: boot loader + boot.loader.systemd-boot.enable = lib.mkDefault true; + boot.kernelPackages = pkgs.linuxPackages_5_1; + boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + +} From 64afb7c12df56edf5070ddd1e92a21bf5d059fdf Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sun, 21 Jul 2019 21:49:13 -0400 Subject: [PATCH 234/624] Wifi fixed by removing iwlwifi-cc-a0-48.ucode --- dell/xps/15-7590/README.wiki | 5 ++++- dell/xps/15-7590/default.nix | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dell/xps/15-7590/README.wiki b/dell/xps/15-7590/README.wiki index b323b3171883..b583b19d55d5 100644 --- a/dell/xps/15-7590/README.wiki +++ b/dell/xps/15-7590/README.wiki @@ -22,7 +22,10 @@ These settings are needed both for booting the final install, and installer itse * ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) === Wifi === -Wifi does not work with kernels older than 5.1 (firmware not present) or newer (https://bbs.archlinux.org/viewtopic.php?id=247705) +~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705) + +Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. + ``` # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix index a3540e7cf324..4a9030ab30c9 100644 --- a/dell/xps/15-7590/default.nix +++ b/dell/xps/15-7590/default.nix @@ -11,4 +11,24 @@ boot.kernelPackages = pkgs.linuxPackages_5_1; boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + # The 48.ucode causes the Killer wifi card to crash. + # The iwlfwifi-cc-a0-46.ucode works perfectly + nixpkgs.pkgs = import { + config.allowUnfree = true; + overlays = [ + (self: super: { + firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { + src = super.fetchgit{ + url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; + sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; + }; + postInstall = '' + rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode + ''; + outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4"; + }); + }) + ]; + }; } From 53ca456f6013f3c6762943a172ee0d4cc656e26f Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sat, 17 Aug 2019 02:08:08 -0400 Subject: [PATCH 235/624] Suggested fixes --- dell/xps/15-7590/README.wiki | 3 +++ dell/xps/15-7590/default.nix | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dell/xps/15-7590/README.wiki b/dell/xps/15-7590/README.wiki index b583b19d55d5..7c7458253fa0 100644 --- a/dell/xps/15-7590/README.wiki +++ b/dell/xps/15-7590/README.wiki @@ -37,6 +37,9 @@ Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46 boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_5_1; ``` +Disable the `canTouchEfiVariables` after a boot or two to prevent NVRAM wearout. + + === After installation === * ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix index 4a9030ab30c9..066637361c22 100644 --- a/dell/xps/15-7590/default.nix +++ b/dell/xps/15-7590/default.nix @@ -4,10 +4,11 @@ imports = [ ../../../common/cpu/intel ../../../common/pc/laptop + ../../../common/pc/ssd ]; # TODO: boot loader - boot.loader.systemd-boot.enable = lib.mkDefault true; + #boot.loader.systemd-boot.enable = lib.mkDefault true; boot.kernelPackages = pkgs.linuxPackages_5_1; boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; From f128fbbdd62527781b3761498c55e014d7fc4d51 Mon Sep 17 00:00:00 2001 From: tomberek Date: Sat, 17 Aug 2019 02:04:44 -0400 Subject: [PATCH 236/624] Update dell/xps/15-7590/README.wiki MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jörg Thalheim --- dell/xps/15-7590/README.wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dell/xps/15-7590/README.wiki b/dell/xps/15-7590/README.wiki index 7c7458253fa0..b55a946ed6e4 100644 --- a/dell/xps/15-7590/README.wiki +++ b/dell/xps/15-7590/README.wiki @@ -17,7 +17,7 @@ Not much tweaking of NixOS itself was needed. But we currently cannot automate t These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. -* ''Disable Secure Boot (but keep UEFI Boot).'' Thakfully doing so is as easy as changing any other simple setting. +* ''Disable Secure Boot (but keep UEFI Boot).'' Thankfully doing so is as easy as changing any other simple setting. * ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) From 3f1a5617bf3aca2b2c4e61af5e8ad644de4cf4e7 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sat, 1 Feb 2020 20:43:01 -0500 Subject: [PATCH 237/624] Make note about EFI and remove 5.1 kernel hardcode --- dell/xps/15-7590/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix index 066637361c22..aa3dd7f3c992 100644 --- a/dell/xps/15-7590/default.nix +++ b/dell/xps/15-7590/default.nix @@ -7,10 +7,8 @@ ../../../common/pc/ssd ]; - # TODO: boot loader - #boot.loader.systemd-boot.enable = lib.mkDefault true; - boot.kernelPackages = pkgs.linuxPackages_5_1; - boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + # Set to true for just the first run, then disable it. + # boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; # The 48.ucode causes the Killer wifi card to crash. # The iwlfwifi-cc-a0-46.ucode works perfectly From 22a16c801ccc908e6d4c8893e0bdf7e38e623e89 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sat, 1 Feb 2020 21:11:31 -0500 Subject: [PATCH 238/624] Apply suggestions from 9999years --- dell/xps/15-7590/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix index aa3dd7f3c992..cad9ba689850 100644 --- a/dell/xps/15-7590/default.nix +++ b/dell/xps/15-7590/default.nix @@ -10,6 +10,12 @@ # Set to true for just the first run, then disable it. # boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + # Earlier font-size setup + console.earlySetup = true; + + # Prevent small EFI partiion from filling up + boot.loader.grub.configurationLimit = 10; + # The 48.ucode causes the Killer wifi card to crash. # The iwlfwifi-cc-a0-46.ucode works perfectly nixpkgs.pkgs = import { From 5758237cbc389321b8078a4901891a5b1c1ea460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Feb 2020 11:53:51 +0000 Subject: [PATCH 239/624] README.md: link to dell xps 15-7590 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c86792e461e2..adee2a27c20f 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ See code for all available configurations. | [Dell XPS 13 9360][] | `` | | [Dell XPS 13 9370][] | `` | | [Dell XPS 13 9380][] | `` | +| [Dell XPS 15 7590][] | `` | | [Dell XPS 15 9550][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | From 77983d16f6ddcbdaf65d7656e82d39669095be6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Feb 2020 12:00:38 +0000 Subject: [PATCH 240/624] xps-15-7590: convert wiki to markdown. This allows it to symlink it in the README --- dell/xps/15-7590/{README.wiki => README.md} | 39 ++++++++++----------- 1 file changed, 18 insertions(+), 21 deletions(-) rename dell/xps/15-7590/{README.wiki => README.md} (59%) diff --git a/dell/xps/15-7590/README.wiki b/dell/xps/15-7590/README.md similarity index 59% rename from dell/xps/15-7590/README.wiki rename to dell/xps/15-7590/README.md index b55a946ed6e4..9c41d94d200b 100644 --- a/dell/xps/15-7590/README.wiki +++ b/dell/xps/15-7590/README.md @@ -1,28 +1,28 @@ -= Dell XPS 15 7590 = -*Mostly copied from 15-9550 +# Dell XPS 15 7590 +- Mostly copied from 15-9550 -== Tested Hardware == +## Tested Hardware -* CPU: Intel(R) Core(TM) i9-9980HK -* RAM: 32 GB -* HDD: 1 TiB SSD -* Screen: 15" 4k (3840✕2160) -* Input: Touchscreen and trackpad. +- CPU: Intel(R) Core(TM) i9-9980HK +- RAM: 32 GB +- HDD: 1 TiB SSD +- Screen: 15" 4k (3840✕2160) +- Input: Touchscreen and trackpad. -== Firmware Configuration == +## Firmware Configuration Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. -=== Before installation === +### Before installation These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. -* ''Disable Secure Boot (but keep UEFI Boot).'' Thankfully doing so is as easy as changing any other simple setting. +- **Disable Secure Boot (but keep UEFI Boot).** Thankfully doing so is as easy as changing any other simple setting. -* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) +- **Disable Intel hardware RAID and use AHCI instead.** Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) -=== Wifi === -~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705) +### Wifi +**Wifi does not work with kernels older than 5.1 (firmware not present) or newer** (https://bbs.archlinux.org/viewtopic.php?id=247705) Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. @@ -40,13 +40,10 @@ Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46 Disable the `canTouchEfiVariables` after a boot or two to prevent NVRAM wearout. -=== After installation === +### After installation -* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. +- **Add systemd-boot to UEFI boot list.** The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. -=== Optional === - -* ''Update BIOS.'' According to Reddit, this helps with battery life. - -=== Troubleshooting === +### Optional +- **Update BIOS.** According to Reddit, this helps with battery life. \ No newline at end of file From 4e19a42bd2349b4386357db02c27fbf41413969e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Feb 2020 12:03:13 +0000 Subject: [PATCH 241/624] dell-xps-15-7590: fix README link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index adee2a27c20f..23199abe6b8f 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ See code for all available configurations. [Dell XPS 13 9360]: dell/xps/13-9360 [Dell XPS 13 9370]: dell/xps/13-9370 [Dell XPS 13 9380]: dell/xps/13-9380 +[Dell XPS 15 7590]: dell/xps/15-9550 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen From 2ab4e61b32bb70533ff03a86d3e2b3896e918fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Feb 2020 12:04:46 +0000 Subject: [PATCH 242/624] Revert "xps-15-7590: convert wiki to markdown." This reverts commit 77983d16f6ddcbdaf65d7656e82d39669095be6f. apparently github can link to wiki text fine. --- README.md | 2 +- dell/xps/15-7590/{README.md => README.wiki} | 39 +++++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) rename dell/xps/15-7590/{README.md => README.wiki} (59%) diff --git a/README.md b/README.md index 23199abe6b8f..b7eeae080638 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ See code for all available configurations. [Dell XPS 13 9360]: dell/xps/13-9360 [Dell XPS 13 9370]: dell/xps/13-9370 [Dell XPS 13 9380]: dell/xps/13-9380 -[Dell XPS 15 7590]: dell/xps/15-9550 +[Dell XPS 15 7590]: dell/xps/15-7590 [Dell XPS 15 9550]: dell/xps/15-9550 [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen diff --git a/dell/xps/15-7590/README.md b/dell/xps/15-7590/README.wiki similarity index 59% rename from dell/xps/15-7590/README.md rename to dell/xps/15-7590/README.wiki index 9c41d94d200b..b55a946ed6e4 100644 --- a/dell/xps/15-7590/README.md +++ b/dell/xps/15-7590/README.wiki @@ -1,28 +1,28 @@ -# Dell XPS 15 7590 -- Mostly copied from 15-9550 += Dell XPS 15 7590 = +*Mostly copied from 15-9550 -## Tested Hardware +== Tested Hardware == -- CPU: Intel(R) Core(TM) i9-9980HK -- RAM: 32 GB -- HDD: 1 TiB SSD -- Screen: 15" 4k (3840✕2160) -- Input: Touchscreen and trackpad. +* CPU: Intel(R) Core(TM) i9-9980HK +* RAM: 32 GB +* HDD: 1 TiB SSD +* Screen: 15" 4k (3840✕2160) +* Input: Touchscreen and trackpad. -## Firmware Configuration +== Firmware Configuration == Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. -### Before installation +=== Before installation === These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. -- **Disable Secure Boot (but keep UEFI Boot).** Thankfully doing so is as easy as changing any other simple setting. +* ''Disable Secure Boot (but keep UEFI Boot).'' Thankfully doing so is as easy as changing any other simple setting. -- **Disable Intel hardware RAID and use AHCI instead.** Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) +* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) -### Wifi -**Wifi does not work with kernels older than 5.1 (firmware not present) or newer** (https://bbs.archlinux.org/viewtopic.php?id=247705) +=== Wifi === +~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705) Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. @@ -40,10 +40,13 @@ Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46 Disable the `canTouchEfiVariables` after a boot or two to prevent NVRAM wearout. -### After installation +=== After installation === -- **Add systemd-boot to UEFI boot list.** The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. +* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. -### Optional +=== Optional === + +* ''Update BIOS.'' According to Reddit, this helps with battery life. + +=== Troubleshooting === -- **Update BIOS.** According to Reddit, this helps with battery life. \ No newline at end of file From 521f68099984977d749d52b9a954da15732b095f Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Fri, 7 Feb 2020 09:55:01 -0500 Subject: [PATCH 243/624] Add Dell XPS 15-7590 suggested options These suggested options are taken from my configuration but aren't quite universal enough to be enabled by default. --- dell/xps/15-7590/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix index cad9ba689850..221070833d7b 100644 --- a/dell/xps/15-7590/default.nix +++ b/dell/xps/15-7590/default.nix @@ -10,6 +10,13 @@ # Set to true for just the first run, then disable it. # boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + # Load GPU drivers. + # hardware.bumblebee.enable = lib.mkDefault true; + + # High DPI for X users. 175 "looks reasonable" but I didn't do the actual DPI + # calculation. + # services.xserver.dpi = lib.mkDefault 175; + # Earlier font-size setup console.earlySetup = true; From 6587634ad83156202c4d8911e6bc4b8e28047157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 9 Feb 2020 08:40:38 +0000 Subject: [PATCH 244/624] xps/15-7590: don't enable unfree firmware by default Also don't set nixpkgs.pkgs. Instead just add an overlay. --- dell/xps/15-7590/README.wiki | 4 +++- dell/xps/15-7590/default.nix | 33 +++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dell/xps/15-7590/README.wiki b/dell/xps/15-7590/README.wiki index b55a946ed6e4..052df2911f1b 100644 --- a/dell/xps/15-7590/README.wiki +++ b/dell/xps/15-7590/README.wiki @@ -24,7 +24,9 @@ These settings are needed both for booting the final install, and installer itse === Wifi === ~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705) -Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. +Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. +default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. +To use it one also needs to enable unfree firmware in their own configuration (hardware.enableRedistributableFirmware = true;) ``` # Use the systemd-boot EFI boot loader. diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix index cad9ba689850..b7c5b66410b0 100644 --- a/dell/xps/15-7590/default.nix +++ b/dell/xps/15-7590/default.nix @@ -18,22 +18,19 @@ # The 48.ucode causes the Killer wifi card to crash. # The iwlfwifi-cc-a0-46.ucode works perfectly - nixpkgs.pkgs = import { - config.allowUnfree = true; - overlays = [ - (self: super: { - firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { - src = super.fetchgit{ - url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; - sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; - }; - postInstall = '' - rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode - ''; - outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4"; - }); - }) - ]; - }; + nixpkgs.overlays = [ + (self: super: { + firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { + src = super.fetchgit{ + url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; + sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; + }; + postInstall = '' + rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode + ''; + outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4"; + }); + }) + ]; } From d75b12a962d403e053fc3e547a3f1f2003ea4387 Mon Sep 17 00:00:00 2001 From: Luis Hebendanz Date: Tue, 11 Feb 2020 19:42:02 +0100 Subject: [PATCH 245/624] Added profile for issues 69289 --- lenovo/thinkpad/e495/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 lenovo/thinkpad/e495/default.nix diff --git a/lenovo/thinkpad/e495/default.nix b/lenovo/thinkpad/e495/default.nix new file mode 100644 index 000000000000..ac0b9492bb15 --- /dev/null +++ b/lenovo/thinkpad/e495/default.nix @@ -0,0 +1,10 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../. + ../../../common/cpu/amd + ]; + + boot.kernelPackages = pkgs.linuxPackages_5_2; +} From f6e2381344544751ce3eda7f95c71a190ee6a639 Mon Sep 17 00:00:00 2001 From: Luis Hebendanz Date: Wed, 12 Feb 2020 10:52:49 +0100 Subject: [PATCH 246/624] Update lenovo/thinkpad/e495/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jörg Thalheim --- lenovo/thinkpad/e495/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lenovo/thinkpad/e495/default.nix b/lenovo/thinkpad/e495/default.nix index ac0b9492bb15..5c78d99374d3 100644 --- a/lenovo/thinkpad/e495/default.nix +++ b/lenovo/thinkpad/e495/default.nix @@ -6,5 +6,6 @@ ../../../common/cpu/amd ]; - boot.kernelPackages = pkgs.linuxPackages_5_2; + # see https://github.com/NixOS/nixpkgs/issues/69289 + boot.kernelPackages = lib.mkIf (lib.versionOlder linux.version "5.2") pkgs.linuxPackages_latest; } From 6c7550d0b40932c9263960ff07d60318bbd59a65 Mon Sep 17 00:00:00 2001 From: Luis Hebendanz Date: Wed, 12 Feb 2020 10:56:49 +0100 Subject: [PATCH 247/624] Added entry Thnikpad E495 to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7d79785fc42f..68ba99aac4ec 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ See code for all available configurations. | [Dell XPS 15 9550][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | +| Lenovo ThinkPad E495 | `` | | Lenovo ThinkPad L13 | `` | | Lenovo ThinkPad P53 | `` | | Lenovo ThinkPad T410 | `` | From f5a4954ca3f062dca1c36a2ccd6354b8eaf671aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 12 Feb 2020 10:57:21 +0000 Subject: [PATCH 248/624] thinkpad/e495: fix evaluation fixes #145 --- lenovo/thinkpad/e495/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/thinkpad/e495/default.nix b/lenovo/thinkpad/e495/default.nix index 5c78d99374d3..51ddb5cfd010 100644 --- a/lenovo/thinkpad/e495/default.nix +++ b/lenovo/thinkpad/e495/default.nix @@ -7,5 +7,5 @@ ]; # see https://github.com/NixOS/nixpkgs/issues/69289 - boot.kernelPackages = lib.mkIf (lib.versionOlder linux.version "5.2") pkgs.linuxPackages_latest; + boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.2") pkgs.linuxPackages_latest; } From 74efa57ee46ece7ccd95fc133c08badb798f0552 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Tue, 18 Feb 2020 06:13:15 -0500 Subject: [PATCH 249/624] Support NixOS 19.09 for (#141) Virtual console options were renamed in 20.03; use `console.earlySetup` or `boot.earlyVconsoleSetup` depending on OS version. https://github.com/NixOS/nixos-hardware/pull/114#discussion_r374953204 --- dell/xps/15-7590/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dell/xps/15-7590/default.nix b/dell/xps/15-7590/default.nix index 2fcaf8b7a23f..eeb69e204ee9 100644 --- a/dell/xps/15-7590/default.nix +++ b/dell/xps/15-7590/default.nix @@ -1,6 +1,13 @@ { lib, ... }: - -{ +# Earlier font-size setup. +# Virtual console options were renamed in 20.03; use the right option depending +# on the OS version; keep this here at least until 20.03 is stable. +lib.recursiveUpdate +(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then { + console.earlySetup = true; +} else { + boot.earlyVconsoleSetup = true; +}) { imports = [ ../../../common/cpu/intel ../../../common/pc/laptop @@ -28,8 +35,9 @@ nixpkgs.overlays = [ (self: super: { firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { - src = super.fetchgit{ - url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; + src = super.fetchgit { + url = + "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; }; From 8b50556e2da89adff2491759c8f5d28af5dd580c Mon Sep 17 00:00:00 2001 From: Daniel Rafaj Date: Wed, 5 Feb 2020 11:40:43 +0100 Subject: [PATCH 250/624] Add xps 9560 with its own quirks, I added versions: 1 default one, with nvidia working and intel working, needs optirun to run application with nvidia 2 intel only, I am using this as my daily driver for long time, only intel is turned on and nvidia is turned off and doesn't drain any power. 3 nvidia only, intel is dissabled and nvidia is picked as default gpu, no need to fiddle with optirun etc, good for gpu heavy application. All these settings needs to reboot to work properly --- dell/xps/15-9560/README.wiki | 54 +++++++++++++++++++++++++++++ dell/xps/15-9560/default.nix | 24 +++++++++++++ dell/xps/15-9560/intel/default.nix | 18 ++++++++++ dell/xps/15-9560/nvidia/default.nix | 20 +++++++++++ dell/xps/15-9560/xps-common.nix | 12 +++++++ 5 files changed, 128 insertions(+) create mode 100644 dell/xps/15-9560/README.wiki create mode 100644 dell/xps/15-9560/default.nix create mode 100644 dell/xps/15-9560/intel/default.nix create mode 100644 dell/xps/15-9560/nvidia/default.nix create mode 100644 dell/xps/15-9560/xps-common.nix diff --git a/dell/xps/15-9560/README.wiki b/dell/xps/15-9560/README.wiki new file mode 100644 index 000000000000..faf4ced8bec2 --- /dev/null +++ b/dell/xps/15-9560/README.wiki @@ -0,0 +1,54 @@ += Dell XPS 15 9560 = + +== Tested Hardware == + +* CPU: Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz +* RAM: 16 GB +* HDD: 512 GiB SSD +* Screen: 15.6" FHD(1920x1080) InfinityEdge +* Graphics: NVIDIA Corporation GTX1050 4GB GDDR5, with Intel Graphics too. +* Input: trackpad + + +== Firmware Configuration == + +Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. + +=== Before installation === + +These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. + +* ''Disable Secure Boot (but keep UEFI Boot).'' Thakfully doing so is as easy as changing any other simple setting. + +* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) + + +=== After installation === + +* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. + +=== Optional === + +* ''Disable C-States.'' This is a processor idling thing. It seems to cause random crashes (Blank screen, no normal panic debug dump). Unfortunately, without it, the computer cannot be suspended. On the other hand, it doesn't seem to affect acpi's estimation of battery life when the computer is running with minimal load, but I haven't tested battery life in practice. I list it as optional as there's a tradeoff, and the crashes are rare enough one can probably get through installation just fine. + +* ''Update BIOS.'' According to Reddit, this helps with battery life. + +* ''Update Intel's Thunderbolt firmware.'' Without this, the Thunderbolt port will only work as power source, and not transfer data. + +=== Troubleshooting === + +==== rcu_sched freezing problems ==== + +After a recent update my machine became unstable. X couldn't start and even running `lspci` would lock the machine. I'm not sure what the root cause was, but I found the fix here: https://wiki.archlinux.org/index.php/Dell_XPS_15_9560#Troubleshooting + +TL;DR I added this line: + I am leaving these params here, I haven't test these so use on your own risk. + I am using different method to disable nvidia. + ("acpi_rev_override=1" param is save and I have been using it for a while now, + no crashes.) + +``` +boot.kernelParams = [ "acpi_rev_override=1" "pcie_aspm=off" "nouveau.modeset=0" ]; +``` + +Some more detail about the problem can be found here: https://bbs.archlinux.org/viewtopic.php?id=223056 diff --git a/dell/xps/15-9560/default.nix b/dell/xps/15-9560/default.nix new file mode 100644 index 000000000000..e7ec6c29d53e --- /dev/null +++ b/dell/xps/15-9560/default.nix @@ -0,0 +1,24 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop + ./xps-common.nix + ]; + + # This configuration makes intel default and optionaly applications could run nvidia with optirun. + # To Optimize for your use case import intel or nvidia only configuration instead + # xps-9560/intel + # or + # xps-9560/nvidia + + + ##### bumblebee working, needs reboot to take affect and to use it run: optirun "" + services.xserver.videoDrivers = lib.mkDefault [ "intel" "nvidia" ]; + boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "bbswitch" ]; + boot.extraModulePackages = lib.mkDefault [ pkgs.linuxPackages.nvidia_x11 ]; + hardware.bumblebee.enable = lib.mkDefault true; + hardware.bumblebee.pmMethod = lib.mkDefault "none"; + +} diff --git a/dell/xps/15-9560/intel/default.nix b/dell/xps/15-9560/intel/default.nix new file mode 100644 index 000000000000..f20379786ddb --- /dev/null +++ b/dell/xps/15-9560/intel/default.nix @@ -0,0 +1,18 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../../common/cpu/intel + ../../../../common/pc/laptop + ../xps-common.nix + ]; + + + # This runs only Intel and nvidia does not drain power. + + ##### disable nvidia, very nice battery life. + hardware.nvidiaOptimus.disable = lib.mkDefault true; + boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" ]; + services.xserver.videoDrivers = lib.mkDefault [ "intel" ]; + +} diff --git a/dell/xps/15-9560/nvidia/default.nix b/dell/xps/15-9560/nvidia/default.nix new file mode 100644 index 000000000000..2cd5d1b158dc --- /dev/null +++ b/dell/xps/15-9560/nvidia/default.nix @@ -0,0 +1,20 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../../common/cpu/intel + ../../../../common/pc/laptop + ../xps-common.nix + ]; + + + # This runs only nvidia, great for games or heavy use of render applications + + ##### disable intel, run nvidia only and as default + services.xserver.videoDrivers = lib.mkDefault ["nvidia"]; + hardware.nvidia.modesetting.enable = lib.mkDefault true; + hardware.nvidia.optimus_prime.enable = lib.mkDefault true; + hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkDefault "PCI:1:0:0"; + hardware.nvidia.optimus_prime.intelBusId = lib.mkDefault "PCI:0:2:0"; + +} diff --git a/dell/xps/15-9560/xps-common.nix b/dell/xps/15-9560/xps-common.nix new file mode 100644 index 000000000000..62aae078545d --- /dev/null +++ b/dell/xps/15-9560/xps-common.nix @@ -0,0 +1,12 @@ +{ lib, ... }: + +{ + + # Boot loader + boot.loader.systemd-boot.enable = lib.mkDefault true; + boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; + boot.kernelParams = lib.mkDefault [ "acpi_rev_override" ]; + + # This will save you money and possibly your life! + services.thermald.enable = lib.mkDefault true; +} From 26454a206d67fa02f2656fe6aaca053f31983600 Mon Sep 17 00:00:00 2001 From: Daniel Rafaj Date: Wed, 5 Feb 2020 11:47:52 +0100 Subject: [PATCH 251/624] add xps 9560 root readme to be able to easily find --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 68ba99aac4ec..c3cd6724cf74 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,9 @@ See code for all available configurations. | [Dell XPS 13 9380][] | `` | | [Dell XPS 15 7590][] | `` | | [Dell XPS 15 9550][] | `` | +| [Dell XPS 15 9560][] | `` | +| [Dell XPS 15 9560, intel only][] | `` | +| [Dell XPS 15 9560, nvidia only][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | | Lenovo ThinkPad E495 | `` | @@ -83,6 +86,9 @@ See code for all available configurations. [Dell XPS 13 9380]: dell/xps/13-9380 [Dell XPS 15 7590]: dell/xps/15-7590 [Dell XPS 15 9550]: dell/xps/15-9550 +[Dell XPS 15 9560]: dell/xps/15-9560 +[Dell XPS 15 9560, intel only]: dell/xps/15-9560/intel +[Dell XPS 15 9560, nvidia only]: dell/xps/15-9560/nvidia [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen [Lenovo ThinkPad X260]: lenovo/thinkpad/x260 From 9c952961f1f1a643b8b8e5d4efab6717afec1bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Feb 2020 11:01:02 +0000 Subject: [PATCH 252/624] Add parallel test runner The new test runner will evaluate all test profiles from the README.md in parallel in separate nix-build processes. Since we do not load all processes into one process, this also helps saving memory. --- .travis.yml | 3 +- README.md | 6 +++ raspberry-pi/2/default.nix | 2 +- release.nix | 55 -------------------- tests/build-profile.nix | 19 +++++++ tests/run.py | 102 +++++++++++++++++++++++++++++++++++++ 6 files changed, 130 insertions(+), 57 deletions(-) delete mode 100644 release.nix create mode 100644 tests/build-profile.nix create mode 100755 tests/run.py diff --git a/.travis.yml b/.travis.yml index 30ff7de840da..91cf21da023e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,2 +1,3 @@ language: nix -script: nix-build release.nix --dry-run --show-trace +script: + ./tests/run.py diff --git a/README.md b/README.md index c3cd6724cf74..ca011c4890cc 100644 --- a/README.md +++ b/README.md @@ -97,3 +97,9 @@ See code for all available configurations. [Samsung Series 9 NP900X3C]: samsung/np900x3c [Purism Librem 13v3]: purism/librem/13v3 [Toshiba Chromebook 2 `swanky`]: toshiba/swanky + +## How to contribute a new device profile + +1. Add your device profile expression in the appropriate directory +2. Link it in the table in README.md +3. Run ./tests/run.py to test it. The test script script will parse all the profiles from the README.md diff --git a/raspberry-pi/2/default.nix b/raspberry-pi/2/default.nix index bc9ca2ab0c23..d10bbd2424d9 100644 --- a/raspberry-pi/2/default.nix +++ b/raspberry-pi/2/default.nix @@ -4,7 +4,7 @@ boot = { consoleLogLevel = lib.mkDefault 7; extraTTYs = [ "ttyAMA0" ]; - kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi; + kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi2; kernelParams = [ "dwc_otg.lpm_enable=0" "console=ttyAMA0,115200" diff --git a/release.nix b/release.nix deleted file mode 100644 index 88abd260d756..000000000000 --- a/release.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ ... }: - -let - shim = { - boot.loader.systemd-boot.enable = true; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; - fsType = "btrfs"; - }; - - nixpkgs.config = { - allowBroken = true; - allowUnfree = true; - }; - }; - - buildProfile = profile: (import { - configuration.imports = [ profile shim ]; - }).system; -in - -{ - acer-aspire-4810t = buildProfile ./acer/aspire/4810t; - - airis-n990 = buildProfile ./airis/n990; - - apple-macbook-air-4 = buildProfile ./apple/macbook-air/4; - apple-macbook-air-6 = buildProfile ./apple/macbook-air/6; - apple-macbook-pro-10-1 = buildProfile ./apple/macbook-pro/10-1; - apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5; - apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1; - - dell-e7240 = buildProfile ./dell/e7240; - dell-xps-13-9380 = buildProfile ./dell/xps/13-9380; - dell-xps-13-9370 = buildProfile ./dell/xps/13-9370; - dell-xps-15-9550 = buildProfile ./dell/xps/15-9550; - - lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410; - lenovo-thinkpad-t440p = buildProfile ./lenovo/thinkpad/t440p; - lenovo-thinkpad-t450s = buildProfile ./lenovo/thinkpad/t450s; - lenovo-thinkpad-t460s = buildProfile ./lenovo/thinkpad/t460s; - lenovo-thinkpad-x140e = buildProfile ./lenovo/thinkpad/x140e; - lenovo-thinkpad-x220 = buildProfile ./lenovo/thinkpad/x220; - lenovo-thinkpad-x230 = buildProfile ./lenovo/thinkpad/x230; - lenovo-thinkpad-x250 = buildProfile ./lenovo/thinkpad/x250; - lenovo-thinkpad-x260 = buildProfile ./lenovo/thinkpad/x260; - lenovo-thinkpad-x280 = buildProfile ./lenovo/thinkpad/x280; - - microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3; - - pcengines-apu = buildProfile ./pcengines/apu; - - toshiba-swanky = buildProfile ./toshiba/swanky; -} diff --git a/tests/build-profile.nix b/tests/build-profile.nix new file mode 100644 index 000000000000..c4509d36ad33 --- /dev/null +++ b/tests/build-profile.nix @@ -0,0 +1,19 @@ +{ profile }: + +let + shim = { + boot.loader.systemd-boot.enable = true; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; + fsType = "btrfs"; + }; + + nixpkgs.config = { + allowBroken = true; + allowUnfree = true; + }; + }; +in (import { + configuration.imports = [ profile shim ]; +}).system diff --git a/tests/run.py b/tests/run.py new file mode 100755 index 000000000000..653337d19190 --- /dev/null +++ b/tests/run.py @@ -0,0 +1,102 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix -p python3 -i python + +import argparse +import multiprocessing +import re +import subprocess +import sys +from pathlib import Path +from typing import List, Tuple + +TEST_ROOT = Path(__file__).resolve().parent +ROOT = TEST_ROOT.parent + +GREEN = "\033[92m" +RED = "\033[91m" +RESET = "\033[0m" + + +def parse_readme() -> List[str]: + profiles = set() + with open(ROOT.joinpath("README.md")) as f: + for line in f: + results = re.findall(r"]+>", line) + profiles.update(results) + return list(profiles) + + +def build_profile(profile: str) -> Tuple[str, subprocess.CompletedProcess]: + # Hard-code this for now until we have enough other architectures to care about this. + system = "x86_64-linux" + if "raspberry-pi/2" in profile: + system = "armv7l-linux" + + cmd = [ + "nix-build", + "-I", + f"nixos-hardware={ROOT}", + "--dry-run", + "--show-trace", + "build-profile.nix", + "--system", + system, + "--arg", + "profile", + profile, + ] + res = subprocess.run( + cmd, cwd=TEST_ROOT, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, + ) + return (profile, res) + + +def parse_args() -> argparse.Namespace: + parser = argparse.ArgumentParser(description="Run hardware tests") + parser.add_argument( + "--jobs", + type=int, + default=multiprocessing.cpu_count(), + help="Number of parallel evaluations." + "If set to 1 it disable multi processing (suitable for debugging)", + ) + parser.add_argument("profiles", nargs="*") + return parser.parse_args() + + +def main() -> None: + args = parse_args() + if len(args.profiles) == 0: + profiles = parse_readme() + else: + profiles = args.profiles + + failed_profiles = [] + + def eval_finished(args: Tuple[str, subprocess.CompletedProcess]) -> None: + profile, res = args + if res.returncode == 0: + print(f"{GREEN}OK {profile}{RESET}") + else: + print(f"{RED}FAIL {profile}:{RESET}", file=sys.stderr) + if res.stdout != "": + print(f"{RED}{res.stdout.rstrip()}{RESET}", file=sys.stderr) + print(f"{RED}{res.stderr.rstrip()}{RESET}", file=sys.stderr) + failed_profiles.append(profile) + + if len(profiles) == 0 or args.jobs == 1: + for profile in profiles: + eval_finished(build_profile(profile)) + else: + pool = multiprocessing.Pool(processes=args.jobs) + for r in pool.imap(build_profile, profiles): + eval_finished(r) + if len(failed_profiles) > 0: + print(f"\n{RED}The following {len(failed_profiles)} test(s) failed:{RESET}") + for profile in failed_profiles: + print(f"{sys.argv[0]} '{profile}'") + sys.exit(1) + + +if __name__ == "__main__": + main() From 62a1812f3c20b7119013650f926806fecd956574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 3 Mar 2020 17:31:54 +0000 Subject: [PATCH 253/624] Update README.wiki --- dell/xps/13-7390/README.wiki | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dell/xps/13-7390/README.wiki b/dell/xps/13-7390/README.wiki index c5eac594576f..48858aab6c72 100644 --- a/dell/xps/13-7390/README.wiki +++ b/dell/xps/13-7390/README.wiki @@ -1,5 +1,9 @@ = Dell XPS 13 7390 = +== Installation == +You need to disable AHCI as described here. +https://wiki.ubuntu.com/Dell/XPS/XPS-13-7390-2-in-1 + == Firmware upgrades == Note that this device is supported by [https://fwupd.org/ fwupd]. From 3d983701f9f6f247d272adb46d834bf591a47938 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 11 Mar 2020 00:09:55 -0700 Subject: [PATCH 254/624] lenovo/thinkpad/t495: init from e495. The E495 and T495 are based on the same core Ryzen platform, so the E495 tweaks apply similarly to the T495. Tested on my own T495, works well. --- README.md | 1 + lenovo/thinkpad/t495/default.nix | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 lenovo/thinkpad/t495/default.nix diff --git a/README.md b/README.md index ca011c4890cc..856702816079 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,7 @@ See code for all available configurations. | Lenovo ThinkPad T470s | `` | | Lenovo ThinkPad T480s | `` | | Lenovo ThinkPad T490 | `` | +| Lenovo ThinkPad T495 | `` | | Lenovo ThinkPad X140e | `` | | Lenovo ThinkPad X220 | `` | | Lenovo ThinkPad X230 | `` | diff --git a/lenovo/thinkpad/t495/default.nix b/lenovo/thinkpad/t495/default.nix new file mode 100644 index 000000000000..51ddb5cfd010 --- /dev/null +++ b/lenovo/thinkpad/t495/default.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../. + ../../../common/cpu/amd + ]; + + # see https://github.com/NixOS/nixpkgs/issues/69289 + boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.2") pkgs.linuxPackages_latest; +} From 03dedf4cfd6762810b08b452258dd64e6584259a Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sat, 14 Mar 2020 20:55:05 -0700 Subject: [PATCH 255/624] thinkpad/t495: fix backlight save/load and and battery conditioning. Saving/loading the backlight state requires the acpi_backlight=native kernel parameter. acpi_call is required by TLP to get access to battery conditioning information from the firmware. Signed-off-by: David Anderson --- lenovo/thinkpad/t495/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lenovo/thinkpad/t495/default.nix b/lenovo/thinkpad/t495/default.nix index 51ddb5cfd010..64957e6e06c7 100644 --- a/lenovo/thinkpad/t495/default.nix +++ b/lenovo/thinkpad/t495/default.nix @@ -4,8 +4,13 @@ imports = [ ../. ../../../common/cpu/amd + ../../../common/pc/laptop/acpi_call.nix ]; + # Force use of the thinkpad_acpi driver for backlight control. + # This allows the backlight save/load systemd service to work. + boot.kernelParams = [ "acpi_backlight=native" ]; + # see https://github.com/NixOS/nixpkgs/issues/69289 boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.2") pkgs.linuxPackages_latest; } From c6722b86bfb34159c130606ff2ce46ef741c3b17 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Mon, 23 Mar 2020 20:19:54 +0100 Subject: [PATCH 256/624] Document librem laptop 15v3 --- README.md | 2 +- purism/librem/13v3/README.md | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 856702816079..1d9234ffa9dc 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ See code for all available configurations. | PC Engines APU | `` | | [Raspberry Pi 2][] | `` | | [Samsung Series 9 NP900X3C][] | `` | -| [Purism Librem 13v3][] | `` | +| [Purism Librem 13v3/15v3][] | `` | | Supermicro A1SRi-2758F | `` | | Supermicro X10SLL-F | `` | | [Toshiba Chromebook 2 `swanky`][] | `` | diff --git a/purism/librem/13v3/README.md b/purism/librem/13v3/README.md index 8009eb3279c4..2ecb6bd704db 100644 --- a/purism/librem/13v3/README.md +++ b/purism/librem/13v3/README.md @@ -1,3 +1,6 @@ +This config is for [Librem 13v3](https://puri.sm/products/librem-13/) and [15v3](https://puri.sm/products/librem-15/) Laptops from Purism. + + Librem comes with Coreboot + SeaBIOS payload. That means EFI boot is not possible. Use `fdisk` to partition hard drive, and GRUB as a bootloader: @@ -10,3 +13,40 @@ possible. Use `fdisk` to partition hard drive, and GRUB as a bootloader: }; } ``` + +## Adding a PureOS partition to the GRUB menu + +I first assume that `boot.loader.grub.useOSProber = true;` should be sufficient. +However GRUB was not able to identify the disks correctly and it took me several +reinstallation till setting `boot.loader.grub.fsIdentifier= "provided";` and using +boot.loader.grub.extraEntries allowed me to dual boot NixOS and PureOS. + +Be aware that each time the PureOS updates the /boot/grub/grub.cfg you will be unable +to boot into NixOS unless you patch grub.cfg manually again. + +Therefore: If you want to be able to boot into your old PureOS distribution +add the following lines, assuming that you have a separate boot partition +Adapt linux version and the UUID to your disk!! + + +```nix +{ + boot.loader.grub.useOSProber = false; + boot.loader.grub.fsIdentifier= "provided"; + boot.loader.grub.extraEntries = '' + menuentry "PureOS with linux 4.19.0-5-amd64 on /dev/sdb2 " { + insmod gzio + if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi + insmod part_msdos + insmod ext2 + set root='hd0,msdos1' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 ef7a4dcf-8cc4-4870-b860-3ed64906f9b9 + else + search --no-floppy --fs-uuid --set=root ef7a4dcf-8cc4-4870-b860-3ed64906f9b9 + fi + linux /vmlinuz-4.19.0-5-amd64 root=UUID=43899f26-04f2-4ccb-b52a-c9441f1a1a6d ro quiet splash resume=UUID=923317f8-d8bb-4e1f-bca3-f36a556de609 # $vt_handoff + initrd /initrd.img-4.19.0-5-amd64 + }; +} +``` From 9238b5f06e1bdac913554b5eb4666cb11d506d82 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Mon, 23 Mar 2020 20:21:11 +0100 Subject: [PATCH 257/624] Automatically lock the desktop when removing the librem key --- purism/librem/13v3/README.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/purism/librem/13v3/README.md b/purism/librem/13v3/README.md index 2ecb6bd704db..b4bae0b2f886 100644 --- a/purism/librem/13v3/README.md +++ b/purism/librem/13v3/README.md @@ -50,3 +50,38 @@ Adapt linux version and the UUID to your disk!! }; } ``` + +## Automatically lock the desktop when removing the librem key + +The [instructions](https://docs.puri.sm/Librem_Key/Getting_Started/User_Manual.html#automatically-lock-the-desktop-when-removing-the-librem-key) to lock the screen after unplugging the [Librem Key](https://puri.sm/products/librem-key/#overview) don't work under NixOS. + +This snippet works on my Librem 15v3 laptop running KDE without wayland and is using the xlock from the package xlockmore. + +```nix +{ pkgs, services , systemd, ... }: +let + libremScreenSaver = pkgs.writeScriptBin "libremScreenSaver" '' + #!${pkgs.bash}/bin/bash + user=`ps aux | egrep "start_kdeinit|gdm-(wayland|x)-session"| head -n 1 | awk '{print $1}'` + if [ -n "$user" ]; then + sudo -u $user DISPLAY=:0 xlock 2>&1 | logger lockScreen for user $user + else + logger libremScreenSaver failed to find a user. Not running KDE? + fi + ''; + +in { + services.udev.path = [ pkgs.procps pkgs.logger pkgs.gawk pkgs.xlockmore ]; + services.udev.extraRules = '' + ACTION=="remove", ENV{PRODUCT}=="316d/4c4b/101" RUN+="${pkgs.systemd}/bin/systemctl --no-block start lockScreen@%k.service" + ''; + systemd.services."lockScreen@" = { + bindsTo = [ "dev-%i.device"] ; + path = [ pkgs.procps pkgs.logger pkgs.sudo pkgs.xlockmore pkgs.gawk ] ; + serviceConfig = { + Type = "oneshot"; # was simple + ExecStart = "${libremScreenSaver}/bin/libremScreenSaver %I"; + }; + }; +} +``` From 12bb72aa6bac6634ca17c5664fda84e29995f763 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Thu, 26 Mar 2020 10:35:01 +0100 Subject: [PATCH 258/624] Create separate directories for librem 13v3 and 15v3 --- README.md | 4 +++- purism/librem/15v3 | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 120000 purism/librem/15v3 diff --git a/README.md b/README.md index 1d9234ffa9dc..8210ed10cabb 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,8 @@ See code for all available configurations. | PC Engines APU | `` | | [Raspberry Pi 2][] | `` | | [Samsung Series 9 NP900X3C][] | `` | -| [Purism Librem 13v3/15v3][] | `` | +| [Purism Librem 13v3][] | `` | +| [Purism Librem 15v3][] | `` | | Supermicro A1SRi-2758F | `` | | Supermicro X10SLL-F | `` | | [Toshiba Chromebook 2 `swanky`][] | `` | @@ -97,6 +98,7 @@ See code for all available configurations. [Raspberry Pi 2]: raspberry-pi/2 [Samsung Series 9 NP900X3C]: samsung/np900x3c [Purism Librem 13v3]: purism/librem/13v3 +[Purism Librem 13v5]: purism/librem/13v5 [Toshiba Chromebook 2 `swanky`]: toshiba/swanky ## How to contribute a new device profile diff --git a/purism/librem/15v3 b/purism/librem/15v3 new file mode 120000 index 000000000000..feb0d06fafda --- /dev/null +++ b/purism/librem/15v3 @@ -0,0 +1 @@ +13v3/ \ No newline at end of file From fbf575fb2587457b321696b88b9382fefe599a8d Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 2 Apr 2020 16:22:10 +0200 Subject: [PATCH 259/624] glxinfo: add eglinfo binary XWayland master did not work correctly for OpenGL, during the bug discussion upstream asked for the output of eglinfo. Add eglinfo to the glxinfo package. --- pkgs/tools/graphics/glxinfo/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 0710f47cb571..9074034b0098 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { $CC src/xdemos/glxgears.c -o glxgears -lGL -lX11 -lm $CC src/egl/opengles2/es2_info.c -o es2_info -lEGL -lGLESv2 -lX11 $CC src/egl/opengles2/es2gears.c src/egl/eglut/{eglut.c,eglut_x11.c} -o es2gears -Isrc/egl/eglut -lEGL -lGLESv2 -lX11 -lm + $CC src/egl/opengl/eglinfo.c -o eglinfo -lEGL -lGLESv2 -lX11 "; installPhase = " - install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} + install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} eglinfo "; meta = with stdenv.lib; { From 0ef7d22b6cd714af9af507ba9e4eab410fd93930 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 14 Apr 2020 22:45:54 +0200 Subject: [PATCH 260/624] lenovo/thinkpad/t460s: Remove problematic options See there links for details: https://github.com/NixOS/nixos-hardware/pull/134#pullrequestreview-336181593 https://github.com/NixOS/nixos-hardware/pull/134#discussion_r361146814 --- lenovo/thinkpad/t460s/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index 41558a35b7f6..59e0942634e8 100644 --- a/lenovo/thinkpad/t460s/default.nix +++ b/lenovo/thinkpad/t460s/default.nix @@ -5,8 +5,4 @@ ../../../common/cpu/intel ../. ]; - - # TODO: boot loader - boot.loader.systemd-boot.enable = lib.mkDefault true; - boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; } From 157ae443af7171422626684bd6b42a3e9a503365 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 14 Apr 2020 22:53:55 +0200 Subject: [PATCH 261/624] lenovo/thinkpad/t460s: Add missing acpi_call module This is required by tlp for battery management. --- lenovo/thinkpad/t460s/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lenovo/thinkpad/t460s/default.nix b/lenovo/thinkpad/t460s/default.nix index 59e0942634e8..e62337171b9a 100644 --- a/lenovo/thinkpad/t460s/default.nix +++ b/lenovo/thinkpad/t460s/default.nix @@ -3,6 +3,7 @@ { imports = [ ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix ../. ]; } From 76f681355cb6c2aab79d190907fbb521bd19ec87 Mon Sep 17 00:00:00 2001 From: j0hax Date: Tue, 21 Apr 2020 02:54:18 +0200 Subject: [PATCH 262/624] Change TLP charge thresholds --- lenovo/thinkpad/x230/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix index 58b09f4c5d5f..6c528ced57a7 100644 --- a/lenovo/thinkpad/x230/default.nix +++ b/lenovo/thinkpad/x230/default.nix @@ -16,4 +16,10 @@ services.xserver.deviceSection = lib.mkDefault '' Option "TearFree" "true" ''; + + services.tlp.extraConfig = lib.mkDefault '' + START_CHARGE_THRESH_BAT0=67 + STOP_CHARGE_THRESH_BAT0=100 + ''; + } From 41d2c3322b118ba26dd9968b5853c11a451a59d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 21 Apr 2020 21:10:18 +0100 Subject: [PATCH 263/624] Revert "Change TLP charge thresholds" This reverts commit 76f681355cb6c2aab79d190907fbb521bd19ec87. This setting is opinionated and should be left to the user. See: https://github.com/NixOS/nixos-hardware/pull/154#issuecomment-617181517 --- lenovo/thinkpad/x230/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lenovo/thinkpad/x230/default.nix b/lenovo/thinkpad/x230/default.nix index 6c528ced57a7..58b09f4c5d5f 100644 --- a/lenovo/thinkpad/x230/default.nix +++ b/lenovo/thinkpad/x230/default.nix @@ -16,10 +16,4 @@ services.xserver.deviceSection = lib.mkDefault '' Option "TearFree" "true" ''; - - services.tlp.extraConfig = lib.mkDefault '' - START_CHARGE_THRESH_BAT0=67 - STOP_CHARGE_THRESH_BAT0=100 - ''; - } From c8e3843b0ad1137e9399451ba55f2c0c1fbcd340 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Thu, 23 Apr 2020 10:52:16 +0200 Subject: [PATCH 264/624] 7390: clarify intent --- dell/xps/13-7390/README.wiki | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dell/xps/13-7390/README.wiki b/dell/xps/13-7390/README.wiki index 48858aab6c72..fdc975f0d6db 100644 --- a/dell/xps/13-7390/README.wiki +++ b/dell/xps/13-7390/README.wiki @@ -1,8 +1,8 @@ = Dell XPS 13 7390 = == Installation == -You need to disable AHCI as described here. -https://wiki.ubuntu.com/Dell/XPS/XPS-13-7390-2-in-1 + +You need to disable RAID and use AHCI instead as described [here](https://wiki.ubuntu.com/Dell/XPS/XPS-13-7390-2-in-1). == Firmware upgrades == From bb1a8b78ba479866e88fe8627d93f42c34bf841f Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Thu, 23 Apr 2020 10:53:17 +0200 Subject: [PATCH 265/624] wiki syntax --- dell/xps/13-7390/README.wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dell/xps/13-7390/README.wiki b/dell/xps/13-7390/README.wiki index fdc975f0d6db..6ec37d0f4476 100644 --- a/dell/xps/13-7390/README.wiki +++ b/dell/xps/13-7390/README.wiki @@ -2,7 +2,7 @@ == Installation == -You need to disable RAID and use AHCI instead as described [here](https://wiki.ubuntu.com/Dell/XPS/XPS-13-7390-2-in-1). +You need to disable RAID and use AHCI instead as described [https://wiki.ubuntu.com/Dell/XPS/XPS-13-7390-2-in-1 here]. == Firmware upgrades == From 7efd48f10058e2bb40239a74fe349645964e47d4 Mon Sep 17 00:00:00 2001 From: Delan Azabani Date: Fri, 24 Apr 2020 18:36:40 +1000 Subject: [PATCH 266/624] README: fix nix-channel --update command Following the current instructions yields these errors for some reason: ``` $ sudo nixos-rebuild switch warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels/nixos' does not exist, ignoring error: file 'nixpkgs/nixos' was not found in the Nix search path (add it using $NIX_PATH or -I), at (string):1:13 building Nix... warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels/nixos' does not exist, ignoring error: file 'nixpkgs/nixos' was not found in the Nix search path (add it using $NIX_PATH or -I) warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels/nixos' does not exist, ignoring error: file 'nixpkgs' was not found in the Nix search path (add it using $NIX_PATH or -I) warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels/nixos' does not exist, ignoring error: file 'nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix' was not found in the Nix search path (add it using $NIX_PATH or -I) /tmp/nixos-rebuild.vs4JVw/nix warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels/nixos' does not exist, ignoring error: file 'nixpkgs' was not found in the Nix search path (add it using $NIX_PATH or -I) building the system configuration... warning: Nix search path entry '/nix/var/nix/profiles/per-user/root/channels/nixos' does not exist, ignoring error: file 'nixpkgs/nixos' was not found in the Nix search path (add it using $NIX_PATH or -I) ``` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8210ed10cabb..08eb1277e838 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Add and update `nixos-hardware` channel: ``` $ sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware -$ sudo nix-channel --update nixos-hardware +$ sudo nix-channel --update ``` Then import an appropriate profile path from the table below. For example, to From b8d6e5c63f3fe301e2f3f2c70e2e8898b271d131 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 24 Apr 2020 22:56:56 +0200 Subject: [PATCH 267/624] gobi_loader: fix maintainers --- pkgs/os-specific/linux/gobi_loader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/gobi_loader/default.nix b/pkgs/os-specific/linux/gobi_loader/default.nix index 5c605de3331b..b79f8af6f8ee 100644 --- a/pkgs/os-specific/linux/gobi_loader/default.nix +++ b/pkgs/os-specific/linux/gobi_loader/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Firmware loader for Qualcomm Gobi USB chipsets"; homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ "0x4A6F" ]; + maintainers = [ maintainers."0x4A6F" ]; platforms = platforms.linux; }; } From d45bece61d944a7bf55d04ea1986df75ec8a8f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Apr 2020 14:54:28 +0100 Subject: [PATCH 268/624] connmanui: remove no update since 2015. The software never left alpha stage --- .../networking/connman/connmanui/default.nix | 34 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/tools/networking/connman/connmanui/default.nix diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix deleted file mode 100644 index 51c97e6cb7ec..000000000000 --- a/pkgs/tools/networking/connman/connmanui/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, glib, gtk3, dbus, pkgconfig, file, intltool, connman }: - -stdenv.mkDerivation rec { - pname = "connmanui"; - rev = "fce0af94e121bde77c7fa2ebd6a319f0180c5516"; - version = "22062015-${rev}"; - - src = fetchgit { - inherit rev; - url = "git://github.com/tbursztyka/connman-ui.git"; - sha256 = "0ixx8c9cfdp480z21xfjb7n1x27sf1g8gmgbmcfhr0k888dmziyy"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool glib gtk3 dbus file intltool connman ]; - - preConfigure = '' - rm m4/intltool.m4 - ln -s ${intltool}/share/aclocal/intltool.m4 m4/ - set -e - ./autogen.sh - sed -i "s/\/usr\/bin\/file/file/g" ./configure - ''; - - configureScript = "./configure"; - - meta = { - description = "A full-featured GTK based trayicon UI for ConnMan"; - homepage = "https://github.com/tbursztyka/connman-ui"; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0628fdaad86b..1f9917e543aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2535,8 +2535,6 @@ in connman-notify = callPackage ../tools/networking/connman/connman-notify { }; - connmanui = callPackage ../tools/networking/connman/connmanui { }; - connman_dmenu = callPackage ../tools/networking/connman/connman_dmenu { }; convertlit = callPackage ../tools/text/convertlit { }; From 6a7713449fa8016f62eeb5dc8bd66223bd743e4a Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Tue, 28 Apr 2020 22:28:46 +0200 Subject: [PATCH 269/624] nixos/printers: fix example for hardware.printers.ensurePrinters.*.model It's `lib.versions`, not `lib.version`. Also I'm really sure that it's supposed to be the current version of Gutenprint, not Cups, as thats what `lpinfo -m` says on my system. --- nixos/modules/hardware/printers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix index 56b91933477d..752de41f26de 100644 --- a/nixos/modules/hardware/printers.nix +++ b/nixos/modules/hardware/printers.nix @@ -84,7 +84,7 @@ in { model = mkOption { type = types.str; example = literalExample '' - gutenprint.''${lib.version.majorMinor (lib.getVersion pkgs.cups)}://brother-hl-5140/expert + gutenprint.''${lib.versions.majorMinor (lib.getVersion pkgs.gutenprint)}://brother-hl-5140/expert ''; description = '' Location of the ppd driver file for the printer. From d7d897fe2499df6a4ea561d7ed642d1c1f30c98e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 5 May 2020 01:19:42 +0530 Subject: [PATCH 270/624] New dell/latitude/3480 The touchpad is painful to use unless the "psmouse" kernel module is disabled. --- README.md | 1 + dell/latitude/3480/default.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 dell/latitude/3480/default.nix diff --git a/README.md b/README.md index 08eb1277e838..2fbf058f6055 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ See code for all available configurations. | [Apple MacBook Pro 10,1][] | `` | | Apple MacBook Pro 12,1 | `` | | BeagleBoard PocketBeagle | `` | +| Dell Latitude 3480 | `` | | [Dell XPS E7240][] | `` | | [Dell XPS 13 7390][] | `` | | [Dell XPS 13 9360][] | `` | diff --git a/dell/latitude/3480/default.nix b/dell/latitude/3480/default.nix new file mode 100644 index 000000000000..86be458a1d96 --- /dev/null +++ b/dell/latitude/3480/default.nix @@ -0,0 +1,14 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop + ../../../common/pc/laptop/ssd + ]; + + # touchpad goes over i2c + boot.blacklistedKernelModules = [ "psmouse" ]; + + services.xserver.videoDrivers = lib.mkDefault [ "intel" ]; +} From 130560e553ef648d81b7c7d4034efd4797a5fb57 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 6 May 2020 00:20:10 +0200 Subject: [PATCH 271/624] Add InfinityBook v4 (#159) --- README.md | 1 + tuxedo/infinitybook/v4/default.nix | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 tuxedo/infinitybook/v4/default.nix diff --git a/README.md b/README.md index 2fbf058f6055..e62a19dcaa12 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ See code for all available configurations. | Supermicro A1SRi-2758F | `` | | Supermicro X10SLL-F | `` | | [Toshiba Chromebook 2 `swanky`][] | `` | +| [Tuxedo InfinityBook v4][] | `` | [Acer Aspire 4810T]: acer/aspire/4810t [Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 diff --git a/tuxedo/infinitybook/v4/default.nix b/tuxedo/infinitybook/v4/default.nix new file mode 100644 index 000000000000..36450bf52680 --- /dev/null +++ b/tuxedo/infinitybook/v4/default.nix @@ -0,0 +1,5 @@ +{ + boot.kernelParams = [ + "i8042.reset" + ]; +} From 16cdc10b488c605c200fdb796e029da25d754906 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 7 May 2020 14:12:35 +0000 Subject: [PATCH 272/624] google/pixelbook: init --- README.md | 2 ++ google/pixelbook/default.nix | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 google/pixelbook/default.nix diff --git a/README.md b/README.md index e62a19dcaa12..bd5e119a7cd3 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ See code for all available configurations. | [Dell XPS 15 9560][] | `` | | [Dell XPS 15 9560, intel only][] | `` | | [Dell XPS 15 9560, nvidia only][] | `` | +| [Google Pixelbook][] | `` | | [Inverse Path USB armory][] | `` | | Lenovo IdeaPad Z510 | `` | | Lenovo ThinkPad E495 | `` | @@ -93,6 +94,7 @@ See code for all available configurations. [Dell XPS 15 9560]: dell/xps/15-9560 [Dell XPS 15 9560, intel only]: dell/xps/15-9560/intel [Dell XPS 15 9560, nvidia only]: dell/xps/15-9560/nvidia +[Google Pixelbook]: google/pixelbook [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen [Lenovo ThinkPad X260]: lenovo/thinkpad/x260 diff --git a/google/pixelbook/default.nix b/google/pixelbook/default.nix new file mode 100644 index 000000000000..1ea4c7afdbdd --- /dev/null +++ b/google/pixelbook/default.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + imports = [ + ../../common/pc/laptop + ../../common/pc/laptop/ssd + ../../common/cpu/intel/kaby-lake + ]; +} From a4763da299ff20bc7f50ee611b311c236b79dea4 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 8 May 2020 16:38:16 +0200 Subject: [PATCH 273/624] nixos/mpd: add services.mpd.fluidsynth option fluidsynth is compiled in but soundfont-fluid needs to be explicitely pulled in and path configured, an option makes it much simpler to use --- nixos/modules/services/audio/mpd.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index f4eb4a265a46..1d2a982ac536 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -21,6 +21,12 @@ let ${optionalString (cfg.network.listenAddress != "any") ''bind_to_address "${cfg.network.listenAddress}"''} ${optionalString (cfg.network.port != 6600) ''port "${toString cfg.network.port}"''} + ${optionalString (cfg.fluidsynth) '' + decoder { + plugin "fluidsynth" + soundfont "${pkgs.soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2" + } + ''} ${cfg.extraConfig} ''; @@ -133,6 +139,14 @@ in { parameter is omitted from the configuration. ''; }; + + fluidsynth = mkOption { + type = types.bool; + default = false; + description = '' + If set, add fluidsynth soundfont and configure the plugin. + ''; + }; }; }; From 69b9bdd53a6c5d2559066691349282f8f961cb3e Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Thu, 14 May 2020 20:33:15 +0100 Subject: [PATCH 274/624] dell/xps/13-9360: Stop using i18n.consoleFont trace: warning: The option `i18n.consoleFont' defined in `/nix/var/nix/profiles/per-user/root/channels/nixos-hardware/dell/xps/13-9360' has been renamed to `console.font'. --- dell/xps/13-9360/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix index 5ff1e54a46b6..439bbe09f564 100644 --- a/dell/xps/13-9360/default.nix +++ b/dell/xps/13-9360/default.nix @@ -1,6 +1,14 @@ { lib, pkgs, ... }: -{ +# TODO: move to general HiDPI profile +# 4K screen, use bigger console font +# i18n.consoleFont deprecated in >=20.03, choose option based on OS version +lib.recursiveUpdate +(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then { + console.font = lib.mkDefault "latarcyrheb-sun32"; +} else { + i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32"; +}) { imports = [ ../../../common/cpu/intel/kaby-lake ../../../common/pc/laptop @@ -16,9 +24,6 @@ hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ]; - # TODO: move to general HiDPI profile - i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32"; # 4K screen, use bigger console font - # TODO: upstream to NixOS/nixpkgs nixpkgs.overlays = [(final: previous: { qca6174-firmware = final.callPackage ./qca6174-firmware.nix {}; From 5f830cf8fcf073c0495f6f7f6fc9a27a63857e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 17 May 2020 07:56:56 +0100 Subject: [PATCH 275/624] make tests less verbose --- tests/run.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/run.py b/tests/run.py index 653337d19190..dde79291409a 100755 --- a/tests/run.py +++ b/tests/run.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p nix -p python3 -i python +#!nix-shell --quiet -p nix -p python3 -i python import argparse import multiprocessing @@ -33,12 +33,13 @@ def build_profile(profile: str) -> Tuple[str, subprocess.CompletedProcess]: system = "armv7l-linux" cmd = [ - "nix-build", + "nix", + "build", + "-f", "build-profile.nix", "-I", f"nixos-hardware={ROOT}", "--dry-run", "--show-trace", - "build-profile.nix", "--system", system, "--arg", From 744d5561bed95b224a7e401d42381653789f269e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 17 May 2020 08:07:37 +0100 Subject: [PATCH 276/624] README.md: add missing link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bd5e119a7cd3..56dbbca4babb 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,7 @@ See code for all available configurations. [Purism Librem 13v3]: purism/librem/13v3 [Purism Librem 13v5]: purism/librem/13v5 [Toshiba Chromebook 2 `swanky`]: toshiba/swanky +[Tuxedo InfinityBook v4]: nixos-hardware/tuxedo/infinitybook/v4 ## How to contribute a new device profile From 8c320bbc8a10879c788a2a2b53b0378f7cf7573d Mon Sep 17 00:00:00 2001 From: Hoang Xuan Phu Date: Sat, 16 May 2020 16:12:10 -0400 Subject: [PATCH 277/624] lenovo/thinkpad/x1/7th-gen: init --- README.md | 2 ++ lenovo/thinkpad/x1/7th-gen/audio.nix | 15 +++++++++++++++ lenovo/thinkpad/x1/7th-gen/default.nix | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 lenovo/thinkpad/x1/7th-gen/audio.nix create mode 100644 lenovo/thinkpad/x1/7th-gen/default.nix diff --git a/README.md b/README.md index bd5e119a7cd3..f417be1b89b2 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ See code for all available configurations. | Lenovo ThinkPad X270 | `` | | Lenovo ThinkPad X280 | `` | | [Lenovo ThinkPad X1 (6th Gen)][] | `` | +| [Lenovo ThinkPad X1 (7th Gen)][] | `` | | Lenovo ThinkPad X1 Extreme Gen 2 | `` | | [Microsoft Surface Pro 3][] | `` | | PC Engines APU | `` | @@ -97,6 +98,7 @@ See code for all available configurations. [Google Pixelbook]: google/pixelbook [Inverse Path USB armory]: inversepath/usbarmory [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen +[Lenovo ThinkPad X1 (7th Gen)]: lenovo/thinkpad/x1/7th-gen [Lenovo ThinkPad X260]: lenovo/thinkpad/x260 [Microsoft Surface Pro 3]: microsoft/surface-pro/3 [Raspberry Pi 2]: raspberry-pi/2 diff --git a/lenovo/thinkpad/x1/7th-gen/audio.nix b/lenovo/thinkpad/x1/7th-gen/audio.nix new file mode 100644 index 000000000000..02f0fdf0ebb9 --- /dev/null +++ b/lenovo/thinkpad/x1/7th-gen/audio.nix @@ -0,0 +1,15 @@ +{ lib, pkgs, ... }: +{ + # This can be removed when the default kernel is at least version 5.6 + # https://github.com/NixOS/nixpkgs/pull/86168 + boot.kernelPackages = lib.mkIf + (lib.versionOlder pkgs.linux.version "5.6") + (lib.mkDefault pkgs.linuxPackages_5_6); + + # This can be removed when PulseAudio is at least version 14 + # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_7)#Audio + hardware.pulseaudio.extraConfig = '' + load-module module-alsa-sink device=hw:0,0 channels=4 + load-module module-alsa-source device=hw:0,6 channels=4 + ''; +} diff --git a/lenovo/thinkpad/x1/7th-gen/default.nix b/lenovo/thinkpad/x1/7th-gen/default.nix new file mode 100644 index 000000000000..8349d05678a2 --- /dev/null +++ b/lenovo/thinkpad/x1/7th-gen/default.nix @@ -0,0 +1,7 @@ +{ + imports = [ + ../. + ../../../../common/pc/laptop/acpi_call.nix + ./audio.nix + ]; +} From 4b129a0f711aea22c52ad8ff48a3126a1b32a988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 May 2020 11:27:18 +0100 Subject: [PATCH 278/624] fix toshiba/swanky evaluation (#167) --- tests/run.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/run.py b/tests/run.py index dde79291409a..d592049878b7 100755 --- a/tests/run.py +++ b/tests/run.py @@ -35,10 +35,10 @@ def build_profile(profile: str) -> Tuple[str, subprocess.CompletedProcess]: cmd = [ "nix", "build", - "-f", "build-profile.nix", + "-f", + "build-profile.nix", "-I", f"nixos-hardware={ROOT}", - "--dry-run", "--show-trace", "--system", system, @@ -46,6 +46,11 @@ def build_profile(profile: str) -> Tuple[str, subprocess.CompletedProcess]: "profile", profile, ] + + # uses import from derivation + if profile != "": + cmd += ["--dry-run"] + print("$ " + " ".join(cmd)) res = subprocess.run( cmd, cwd=TEST_ROOT, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, ) From a13d00bd7cbe5da3cc63c971c4a738486e2f9812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 May 2020 11:38:36 +0100 Subject: [PATCH 279/624] tests: hide evaluation command behind verbose flag --- tests/run.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/run.py b/tests/run.py index d592049878b7..2f514d128907 100755 --- a/tests/run.py +++ b/tests/run.py @@ -6,6 +6,7 @@ import multiprocessing import re import subprocess import sys +from functools import partial from pathlib import Path from typing import List, Tuple @@ -26,7 +27,9 @@ def parse_readme() -> List[str]: return list(profiles) -def build_profile(profile: str) -> Tuple[str, subprocess.CompletedProcess]: +def build_profile( + profile: str, verbose: bool +) -> Tuple[str, subprocess.CompletedProcess]: # Hard-code this for now until we have enough other architectures to care about this. system = "x86_64-linux" if "raspberry-pi/2" in profile: @@ -50,7 +53,8 @@ def build_profile(profile: str) -> Tuple[str, subprocess.CompletedProcess]: # uses import from derivation if profile != "": cmd += ["--dry-run"] - print("$ " + " ".join(cmd)) + if verbose: + print(f"$ {' '.join(cmd)}") res = subprocess.run( cmd, cwd=TEST_ROOT, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, ) @@ -66,6 +70,9 @@ def parse_args() -> argparse.Namespace: help="Number of parallel evaluations." "If set to 1 it disable multi processing (suitable for debugging)", ) + parser.add_argument( + "--verbose", action="store_true", help="Print evaluation commands executed", + ) parser.add_argument("profiles", nargs="*") return parser.parse_args() @@ -90,12 +97,13 @@ def main() -> None: print(f"{RED}{res.stderr.rstrip()}{RESET}", file=sys.stderr) failed_profiles.append(profile) + build = partial(build_profile, verbose=args.verbose) if len(profiles) == 0 or args.jobs == 1: for profile in profiles: - eval_finished(build_profile(profile)) + eval_finished(build(profile)) else: pool = multiprocessing.Pool(processes=args.jobs) - for r in pool.imap(build_profile, profiles): + for r in pool.imap(build, profiles): eval_finished(r) if len(failed_profiles) > 0: print(f"\n{RED}The following {len(failed_profiles)} test(s) failed:{RESET}") From 90868c67e85fcf2efb3f6075203021f0f9bd97f5 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 20 May 2020 16:29:50 +0200 Subject: [PATCH 280/624] pc/laptop: remove redundant cpuFreqGovernor setting This setting has been part of NixOS since version 16.09 --- common/pc/laptop/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/pc/laptop/default.nix b/common/pc/laptop/default.nix index ebc4931dbc29..946d066d04d5 100644 --- a/common/pc/laptop/default.nix +++ b/common/pc/laptop/default.nix @@ -3,11 +3,5 @@ { imports = [ ../. ]; - # TODO: fix in NixOS/nixpkgs - # Disable governor set in hardware-configuration.nix, - # required when services.tlp.enable is true: - powerManagement.cpuFreqGovernor = - lib.mkIf config.services.tlp.enable (lib.mkForce null); - services.tlp.enable = lib.mkDefault true; } From 7ed1ae0d6b64e2599f3f9c24458aa5ec52f9bf6d Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 30 May 2020 00:45:57 -0700 Subject: [PATCH 281/624] musescore: Add missing inputs qtgraphicaleffects, qtquickcontrols2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Although MuseScore builds and starts without these, it’s unusable because the left palette fails to render, with these errors: qrc:/qml/palettes/PalettesWidget.qml:21:1: module "QtQuick.Controls" version 2.1 is not installed or qrc:/qml/palettes/PalettesWidget.qml:47:5: Type PalettesWidgetHeader unavailable qrc:/qml/palettes/PalettesWidgetHeader.qml:37:5: Type StyledButton unavailable qrc:/qml/palettes/StyledButton.qml:22:1: module "QtGraphicalEffects" is not installed Signed-off-by: Anders Kaseorg --- pkgs/applications/audio/musescore/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 063a05a72f3a..0561a0179a61 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,6 +1,7 @@ { stdenv, mkDerivation, lib, fetchzip, cmake, pkgconfig , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis -, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools +, portaudio, portmidi, qtbase, qtdeclarative, qtgraphicaleffects +, qtquickcontrols2, qtscript, qtsvg, qttools , qtwebengine, qtxmlpatterns }: @@ -26,7 +27,8 @@ mkDerivation rec { buildInputs = [ alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis portaudio portmidi # tesseract - qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns + qtbase qtdeclarative qtgraphicaleffects qtquickcontrols2 + qtscript qtsvg qttools qtwebengine qtxmlpatterns ]; meta = with stdenv.lib; { From 50bf5e5d8c4b426c54bcb67913371349b6d823e3 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sun, 31 May 2020 13:37:26 +0200 Subject: [PATCH 282/624] pythonPackages.bitcoinlib: 0.9.0 -> 0.11.0 Upstream is python3-only now. --- .../python-modules/bitcoinlib/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/bitcoinlib/default.nix index dd85789c59e0..71b032a34e49 100644 --- a/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/pkgs/development/python-modules/bitcoinlib/default.nix @@ -1,15 +1,17 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, openssl }: +{ stdenv, lib, buildPythonPackage, isPy3k, fetchFromGitHub, openssl }: let ext = if stdenv.isDarwin then "dylib" else "so"; in buildPythonPackage rec { pname = "bitcoinlib"; - version = "0.9.0"; + version = "0.11.0"; + + disabled = !isPy3k; src = fetchFromGitHub { owner = "petertodd"; - rev = "7a8a47ec6b722339de1d0a8144e55b400216f90f"; repo = "python-bitcoinlib"; - sha256 = "1s1jm2nid7ab7yiwlp1n2v3was9i4q76xmm07wvzpd2zvn5zb91z"; + rev = "python-${pname}-v${version}"; + sha256 = "0pwypd966zzivb37fvg4l6yr7ihplqnr1jwz9zm3biip7x89bdzm"; }; postPatch = '' @@ -21,7 +23,7 @@ in buildPythonPackage rec { meta = { homepage = src.meta.homepage; description = "Easy interface to the Bitcoin data structures and protocol"; - license = with lib.licenses; [ gpl3 ]; + license = with lib.licenses; [ lgpl3 ]; maintainers = with lib.maintainers; [ jb55 ]; }; } From e1f4e114d5ecff7e224764ecf64d49ecc8fb610f Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sun, 31 May 2020 15:07:46 +0200 Subject: [PATCH 283/624] pythonPackages.opentimestamps: relax bitcoinlib dependency Upstream: https://github.com/opentimestamps/python-opentimestamps/pull/43 --- .../python-modules/opentimestamps/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index e9dce6b23222..f132614d1ca0 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, isPy3k , bitcoinlib, GitPython, pysha3, git }: buildPythonPackage rec { @@ -15,6 +15,14 @@ buildPythonPackage rec { sha256 = "0c45ij8absfgwizq6dfgg81siq3y8605sgg184vazp292w8nqmqr"; }; + patches = [ + # build against bitcoinlib-0.11 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/opentimestamps/python-opentimestamps/pull/43.patch"; + sha256 = "0bxzk4pzpqk7zrk2x7vn2bj2n3pc5whf8ijbd225s6674q450zbg"; + }) + ]; + # Remove a failing test which expects the test source file to reside in the # project's Git repo postPatch = '' From d0cb57b10c25c966878217cac8d29eab472f3e22 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 19 May 2020 00:43:36 +0200 Subject: [PATCH 284/624] libreswan: 3.31 -> 3.32 Changes: https://github.com/libreswan/libreswan/releases/tag/v3.32 Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-1763 --- pkgs/tools/networking/libreswan/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 71fdcc947d3a..3e7719c40d41 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -5,9 +5,6 @@ }: let - optional = stdenv.lib.optional; - version = "3.31"; - name = "libreswan-${version}"; binPath = stdenv.lib.makeBinPath [ bash iproute iptables procps coreutils gnused gawk nss.tools which python ]; @@ -16,13 +13,13 @@ in assert docs -> xmlto != null; assert stdenv.isLinux -> libselinux != null; -stdenv.mkDerivation { - inherit name; - inherit version; +stdenv.mkDerivation rec { + pname = "libreswan"; + version = "3.32"; src = fetchurl { - url = "https://download.libreswan.org/${name}.tar.gz"; - sha256 = "1wxqsv11nqgfj5and5xzfgh6ayqvl47midcghd5ryynh60mp7naa"; + url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; + sha256 = "0bj3g6qwd3ir3gk6hdl9npy3k44shf56vcgjahn30qpmx3z5fsr3"; }; # These flags were added to compile v3.18. Try to lift them when updating. @@ -37,8 +34,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent libcap_ng curl nspr nss python ldns ] - ++ optional docs xmlto - ++ optional stdenv.isLinux libselinux; + ++ stdenv.lib.optional docs xmlto + ++ stdenv.lib.optional stdenv.isLinux libselinux; prePatch = '' # Correct bash path From 85760026a07d321f8f5dfd1b5363128e8c567dc5 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Tue, 2 Jun 2020 17:00:09 +1200 Subject: [PATCH 285/624] openresty: make compatible with nixos nginx module --- pkgs/servers/http/openresty/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 9c01cfb19e1d..d845d92ec8a5 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -34,6 +34,8 @@ callPackage ../nginx/generic.nix args rec { postInstall = '' ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty ln -s $out/nginx/sbin/nginx $out/bin/nginx + ln -s $out/nginx/conf $out/conf + ln -s $out/nginx/html $out/html ''; meta = { From 44007dec5c96dbfa3aa2aa5850a4c05804eae38e Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Tue, 2 Jun 2020 17:01:03 +1200 Subject: [PATCH 286/624] nixos/nginx: ensure all variants have a basic level of testing --- nixos/tests/all-tests.nix | 1 + nixos/tests/nginx-variants.nix | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 nixos/tests/nginx-variants.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 796c626f3dde..30aa15c3d53f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -233,6 +233,7 @@ in nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; + nginx-variants = handleTest ./nginx-variants.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; diff --git a/nixos/tests/nginx-variants.nix b/nixos/tests/nginx-variants.nix new file mode 100644 index 000000000000..ca4655391bc5 --- /dev/null +++ b/nixos/tests/nginx-variants.nix @@ -0,0 +1,33 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; + +builtins.listToAttrs ( + builtins.map + (nginxName: + { + name = nginxName; + value = makeTest { + name = "nginx-variant-${nginxName}"; + + machine = { pkgs, ... }: { + services.nginx = { + enable = true; + virtualHosts.localhost.locations."/".return = "200 'foo'"; + package = pkgs."${nginxName}"; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx") + machine.wait_for_open_port(80) + machine.succeed('test "$(curl -fvvv http://localhost/)" = foo') + ''; + }; + } + ) + [ "nginxStable" "nginxUnstable" "nginxShibboleth" "openresty" "tengine" ] +) From 36d52ba5663ebfdbdd8fcab950e90140c4c0c125 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 7 Jun 2020 14:06:05 +0300 Subject: [PATCH 287/624] aerc: unstable-2020-02-01 -> 0.4.0 --- .../networking/mailreaders/aerc/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 584128356393..5609b48671c1 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -4,15 +4,13 @@ , fetchFromGitHub }: -let - rev = "ea0df7bee433fedae5716906ea56141f92b9ce53"; -in buildGoModule rec { +buildGoModule rec { pname = "aerc"; - version = "unstable-2020-02-01"; + version = "0.4.0"; src = fetchurl { - url = "https://git.sr.ht/~sircmpwn/aerc/archive/${rev}.tar.gz"; - sha256 = "1bx2fypw053v3bzalfgyi6a0s5fvv040z8jy4i63s7p53m8gmzs9"; + url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; + sha256 = "05qy14k9wmyhsg1hiv4njfx1zn1m9lz4d1p50kc36v7pq0n4csfk"; }; libvterm = fetchFromGitHub { @@ -22,7 +20,7 @@ in buildGoModule rec { sha256 = "06vv4pgx0i6hjdjcar4ch18hp9g6q6687mbgkvs8ymmbacyhp7s6"; }; - vendorSha256 = "0rnyjjlsxsi0y23m6ckyd52562m33qr35fvdcdzy31mbfpi8kl2k"; + vendorSha256 = "1rqn36510m0yb7k4bvq2hgirr3z8a2h5xa7cq5mb84xsmhvf0g69"; overrideModAttrs = (_: { postBuild = '' From a8ee561b0f2f9d5676a83dfe274985b052343907 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Sun, 7 Jun 2020 19:08:59 +0200 Subject: [PATCH 288/624] jool: 4.0.5 -> 4.0.9 --- pkgs/os-specific/linux/jool/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 9e8de46edba7..abf7b0dac45f 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.0.5"; + version = "4.0.9"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "0zfda8mbcg4mgg39shxdx5n2bq6zi9w3v8bcx03b3dp09lmq45y3"; + sha256 = "0zhdpk1sbsv1iyr9rvj94wk853684avz3zzn4cv2k4254d7n25m7"; }; } From e542f78f56bddb1d412145685033c325b97e7161 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 8 Jun 2020 22:19:59 +0000 Subject: [PATCH 289/624] moolticute: 0.43.16 -> 0.43.19 --- pkgs/applications/misc/moolticute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 6a1521764156..efd9cc4c021d 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.43.16"; + version = "0.43.19"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1gx1hbxiilggwfw0jspyk2cw92r6qs9a8yqa8x1d2ndf493mjx9y"; + sha256 = "1rpkiyhy7z5zq0rmn0kj2kva57bnhkhvaplrlhfczv99h1kwsixg"; }; outputs = [ "out" "udev" ]; From 57012daff98b0701dc4a6b2c232a8f088fd421c1 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Mon, 8 Jun 2020 14:25:16 +0200 Subject: [PATCH 290/624] KAppTemplate: Init at 19.12.3 --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kapptemplate.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/kapptemplate.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 60df1f899ded..82c653edda46 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -89,6 +89,7 @@ let kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; + kapptemplate = callPackage ./kapptemplate.nix { }; kate = callPackage ./kate.nix {}; kbreakout = callPackage ./kbreakout.nix {}; kcachegrind = callPackage ./kcachegrind.nix {}; diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix new file mode 100644 index 000000000000..a5e211318a26 --- /dev/null +++ b/pkgs/applications/kde/kapptemplate.nix @@ -0,0 +1,24 @@ +{ lib +, mkDerivation +, fetchurl +, cmake +, extra-cmake-modules +, qtbase +, kactivities +}: +mkDerivation { + + name = "kapptemplate"; + + nativeBuildInputs = [ extra-cmake-modules cmake ]; + + buildInputs = [ kactivities qtbase ]; + + meta = with lib; { + description = "KDE App Code Template Generator"; + license = licenses.gpl2; + homepage = "https://kde.org/applications/en/development/org.kde.kapptemplate"; + maintainers = [ maintainers.shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3741cae398..13e483932680 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20395,7 +20395,7 @@ in inherit (kdeApplications) akonadi akregator ark dolphin dragon elisa ffmpegthumbs filelight gwenview k3b - kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog + kaddressbook kapptemplate kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; From 6df8995af94751be183903cf4dc4650a10373d3e Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 10 Jun 2020 15:42:15 -0700 Subject: [PATCH 291/624] pythonPackages.pyside2: resolve failing import Currently, `nix-shell -p "python3.withPackages (p: with p; [ pyside2 ])" --run 'python -c "import pyside2"'` fails with a: `ModuleNotFoundError: No module named 'shiboken2'` --- pkgs/development/python-modules/pyside2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index afa48569e2ac..8134e8a573af 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -23,11 +23,12 @@ stdenv.mkDerivation rec { "-DPYTHON_EXECUTABLE=${python.interpreter}" ]; - nativeBuildInputs = [ cmake ninja qt5.qmake shiboken2 python ]; + nativeBuildInputs = [ cmake ninja qt5.qmake python ]; buildInputs = with qt5; [ qtbase qtxmlpatterns qtmultimedia qttools qtx11extras qtlocation qtscript qtwebsockets qtwebengine qtwebchannel qtcharts qtsensors qtsvg ]; + propagatedBuildInputs = [ shiboken2 ]; meta = with stdenv.lib; { description = "LGPL-licensed Python bindings for Qt"; From 37e50ca63513072d7024a3c44500684b4f2e032b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 10 Jun 2020 21:17:09 -0400 Subject: [PATCH 292/624] raspberrypi-builder: ensure scripts fails on error The way this ends up being called with the raspberry pi 4 image builder ends up not using the `-e` from the shebang. In turn, the builds fails during cross-compilation. The wrong coreutils ends up being used, but this is not made apparent. The issue I faced is already fixed on master, but this ensures no one ends up with a failed build "succeeding". --- .../system/boot/loader/raspberrypi/raspberrypi-builder.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh index c8b5bf2e61af..0541ca1ba622 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi-builder.sh @@ -1,4 +1,7 @@ -#! @bash@/bin/sh -e +#! @bash@/bin/sh + +# This can end up being called disregarding the shebang. +set -e shopt -s nullglob From 34caab71bbd2ae342c65667cc999a3be8a1ad336 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 10 Jun 2020 21:30:22 -0400 Subject: [PATCH 293/624] sd-image: Make firmware partition name configurable This will be helpful in the now too-long-lived image for the Raspberry Pi 4. We'll be able to properly configure the partition to be useful. --- nixos/modules/installer/cd-dvd/sd-image.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index 589bf74263b9..d0ef55bd0e16 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -63,6 +63,14 @@ in ''; }; + firmwarePartitionName = mkOption { + type = types.str; + default = "FIRMWARE"; + description = '' + Name of the filesystem which holds the boot firmware. + ''; + }; + rootPartitionUUID = mkOption { type = types.nullOr types.str; default = null; @@ -114,7 +122,7 @@ in config = { fileSystems = { "/boot/firmware" = { - device = "/dev/disk/by-label/FIRMWARE"; + device = "/dev/disk/by-label/${config.sdImage.firmwarePartitionName}"; fsType = "vfat"; # Alternatively, this could be removed from the configuration. # The filesystem is not needed at runtime, it could be treated @@ -178,7 +186,7 @@ in # Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img eval $(partx $img -o START,SECTORS --nr 1 --pairs) truncate -s $((SECTORS * 512)) firmware_part.img - faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.firmwarePartitionID} -n FIRMWARE firmware_part.img + faketime "1970-01-01 00:00:00" mkfs.vfat -i ${config.sdImage.firmwarePartitionID} -n ${config.sdImage.firmwarePartitionName} firmware_part.img # Populate the files intended for /boot/firmware mkdir firmware From 476c8e0754968cc0d56479894ea5c3037dd70892 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 10 Jun 2020 23:32:06 -0400 Subject: [PATCH 294/624] sd-image-raspberrypi4: mount boot partition This should have been done initially, as otherwise it gets awfully awkward to boot into new generations by default. This system-specific image wasn't expected to be long-lived, thus why it didn't end up being polished much. Reality shows us we may be stuck with it for a bit longer, so let's make it easier to use for new users. --- nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix index c545a1e7e242..79c835dc3909 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi4.nix @@ -18,6 +18,7 @@ sdImage = { firmwareSize = 128; + firmwarePartitionName = "NIXOS_BOOT"; # This is a hack to avoid replicating config.txt from boot.loader.raspberryPi populateFirmwareCommands = "${config.system.build.installBootLoader} ${config.system.build.toplevel} -d ./firmware"; @@ -25,6 +26,12 @@ populateRootCommands = ""; }; + fileSystems."/boot/firmware" = { + # This effectively "renames" the loaOf entry set in sd-image.nix + mountPoint = "/boot"; + neededForBoot = true; + }; + # the installation media is also the installation target, # so we don't want to provide the installation configuration.nix. installer.cloneConfig = false; From c3cb2cac554b5409f8ee19792346031b353f1dd0 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 22 Apr 2020 15:50:26 +0200 Subject: [PATCH 295/624] fverb: init at unstable-2020-06-09 --- pkgs/applications/audio/fverb/default.nix | 34 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/audio/fverb/default.nix diff --git a/pkgs/applications/audio/fverb/default.nix b/pkgs/applications/audio/fverb/default.nix new file mode 100644 index 000000000000..289553795743 --- /dev/null +++ b/pkgs/applications/audio/fverb/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitHub +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "fverb"; + # no release yet: https://github.com/jpcima/fverb/issues/2 + version = "unstable-2020-06-09"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = pname; + rev = "462020e33e24c0204a375dc95e2c28654cc917b8"; + sha256 = "12nl7qn7mnykk7v8q0j2n8kfq0xc46n0i45z6qcywspadwnncmd4"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + postPatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + meta = with stdenv.lib; { + description = "A stereo variant of the reverberator by Jon Dattorro, for lv2"; + homepage = "https://github.com/jpcima/fverb"; + license = licenses.bsd2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f45b6df2970b..206543eaa9e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3555,6 +3555,8 @@ in fusee-launcher = callPackage ../development/tools/fusee-launcher { }; + fverb = callPackage ../applications/audio/fverb { }; + fwknop = callPackage ../tools/security/fwknop { }; exfat = callPackage ../tools/filesystems/exfat { }; From af632c92887a99ccb09413918d523025bfa64a3f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jun 2020 10:27:32 +0200 Subject: [PATCH 296/624] snapcast: v0.15.0 -> v0.20.0 --- pkgs/applications/audio/snapcast/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 531a633f05da..25b8f9456a07 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, pkgconfig -, alsaLib, asio, avahi, flac, libogg, libvorbis }: +, alsaLib, asio, avahi, boost170, flac, libogg, libvorbis, soxr }: let @@ -33,21 +33,21 @@ in stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.15.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "11rnpy6w3wm240qgmkp74k5w8wh5b7hzfx05qrnh6l7ng7m25ky2"; + sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig boost170.dev ]; # snapcast also supports building against tremor but as we have libogg, that's # not needed buildInputs = [ alsaLib asio avahi flac libogg libvorbis - aixlog popl + aixlog popl soxr ]; # Upstream systemd unit files are pretty awful, so we provide our own in a From 3717d074e775070fe66928bf23e0cfc43f0f657c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 17:22:53 +0000 Subject: [PATCH 297/624] httplab: 0.3.0 -> 0.4.0 --- pkgs/tools/networking/httplab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index f39b061c34db..f4fb4fe96076 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "httplab"; - version = "0.3.0"; + version = "0.4.0"; rev = "v${version}"; goPackagePath = "github.com/gchaincl/httplab"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "gchaincl"; repo = "httplab"; inherit rev; - sha256 = "1q9rp43z59nryfm79gci5a1gmqw552rqd4cki81rymbj3f6xvrf9"; + sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs"; }; meta = with stdenv.lib; { From 246e6cdd74e15fa380bbfe08891a93794d9ddf37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 18:12:39 +0000 Subject: [PATCH 298/624] jp: 0.1.2 -> 0.1.3 --- pkgs/development/tools/jp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index 1e7d1023edfa..f05c788dabe1 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "jp"; - version = "0.1.2"; + version = "0.1.3"; rev = version; goPackagePath = "github.com/jmespath/jp"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "jmespath"; repo = "jp"; - sha256 = "1i0jl0c062crigkxqx8zpyqliz8j4d37y95cna33jl777kx42r6h"; + sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi"; }; meta = with stdenv.lib; { description = "A command line interface to the JMESPath expression language for JSON"; From 07e09428a651b6e6db97c2813b06a80bdd5232bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 19:42:50 +0000 Subject: [PATCH 299/624] lexicon: 3.3.22 -> 3.3.26 --- pkgs/tools/admin/lexicon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index de967578d5c9..ac5bf918634a 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "lexicon"; - version = "3.3.22"; + version = "3.3.26"; propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ]; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - sha256 = "1adwqglh3lrx04y0f6slp1l97xzbsqgw0v5i4jll3a54aqyzfz0a"; + sha256 = "0k41l5n80hsfr0dkijf4hhkhz6iiwja4aj9q2jdiqsg9fjrmhfrv"; }; meta = with lib; { From c8d1771277f8db40e1f2e81e11a25e7a72a35633 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 08:42:02 +0000 Subject: [PATCH 300/624] bashmount: 3.2.0 -> 4.2.5 --- pkgs/tools/filesystems/bashmount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 5aeff6baaa9a..2d66dfcee9bb 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "3.2.0"; + version = "4.2.5"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "0rki4s0jgz6vkywc6hcx9qa551r5bnjs7sw0rdh93k64l32kh644"; + sha256 = "1gvi2562vng887ba33s774lhhkacl8yl7d8b0yaxylzx0ap2y7l0"; }; installPhase = '' From bb70e10541ecb85d4f908db362e3d34846b6302a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 15 Jun 2020 04:20:00 -0500 Subject: [PATCH 301/624] git-revise: 0.5.1 -> 0.6.0 --- .../python-modules/git-revise/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index b4de60775295..a6dd3ecb7c80 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -1,30 +1,26 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, tox -, pytest -, pylint -, mypy -, black +, git +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "git-revise"; - version = "0.5.1"; + version = "0.6.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0l3xhg00106p7ysg4gl9dna2zcrax58mzmm0ajjaxw58jfn8wsf1"; + # Missing tests on PyPI + src = fetchFromGitHub { + owner = "mystor"; + repo = pname; + rev = "v${version}"; + sha256 = "03v791yhips9cxz9hr07rhsgxfhwyqq17rzi7ayjhwvy65s4hzs9"; }; disabled = pythonOlder "3.6"; - checkInputs = [ tox pytest pylint mypy black ]; - - checkPhase = '' - tox - ''; + checkInputs = [ git pytestCheckHook ]; meta = with lib; { description = "Efficiently update, split, and rearrange git commits"; From 8cd8da2c88aff714ba164fbc4e359c694a45edee Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 15 Jun 2020 12:09:27 +0200 Subject: [PATCH 302/624] clamav: enable build on darwin --- pkgs/tools/security/clamav/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 9b58aa97dd5b..4f286badebf4 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl, libmilter, pcre2 -, libmspack, systemd +, libmspack, systemd, Foundation }: stdenv.mkDerivation rec { @@ -20,13 +20,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre2 libmspack - systemd - ]; + ] ++ stdenv.lib.optional stdenv.isLinux systemd + ++ stdenv.lib.optional stdenv.isDarwin Foundation; configureFlags = [ "--libdir=$(out)/lib" "--sysconfdir=/etc/clamav" - "--with-systemdsystemunitdir=$(out)/lib/systemd" "--disable-llvm" # enabling breaks the build at the moment "--with-zlib=${zlib.dev}" "--with-xml=${libxml2.dev}" @@ -34,7 +33,8 @@ stdenv.mkDerivation rec { "--with-libcurl=${curl.dev}" "--with-system-libmspack" "--enable-milter" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux + "--with-systemdsystemunitdir=$(out)/lib/systemd"; postInstall = '' mkdir $out/etc @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom robberer qknight fpletz globin ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b75778322fe..3608cadf9232 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2712,7 +2712,9 @@ in ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clamav = callPackage ../tools/security/clamav { }; + clamav = callPackage ../tools/security/clamav { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; clex = callPackage ../tools/misc/clex { }; From d6c90aea17d20061763a8079303fcaadccbd6090 Mon Sep 17 00:00:00 2001 From: "Narazaki, Shuji" Date: Mon, 15 Jun 2020 09:40:14 +0900 Subject: [PATCH 303/624] cadical: 1.2.1 -> 1.3.0 --- pkgs/applications/science/logic/cadical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 6a90f50b5aa3..d97c12469849 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "1a66xkw42ad330fvw8i0sawrmg913m8wrq5c85lw5qandkwvxdi6"; + sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf"; }; dontAddPrefix = true; From 6c8b614ed1a90ca0b704f24316ee66a018843f4c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 15 Jun 2020 14:32:45 +0000 Subject: [PATCH 304/624] debianutils: 4.10 -> 4.11 --- pkgs/tools/misc/debianutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 445dfd6f0857..930f1f59a8aa 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.10"; + version = "4.11"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "1mj2hrwm8zr3814yig1f78hzflgih93hmy3dsyx6k0fdcfjkjvmx"; + sha256 = "0lbizfnf3qwsiz2ggia6ff7sjjj8gwhys8bm6wixdc4n0qlycp5v"; }; meta = with stdenv.lib; { From d3e96b4c3a943766aa276d505b5217cf330ca1a3 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 15 Jun 2020 18:43:07 +0200 Subject: [PATCH 305/624] impy: init at 0.1 --- pkgs/development/libraries/impy/default.nix | 44 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/libraries/impy/default.nix diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix new file mode 100644 index 000000000000..c865b25c0009 --- /dev/null +++ b/pkgs/development/libraries/impy/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libpng +, zlib +, giflib +, libjpeg +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "impy"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "bcampbell"; + repo = "impy"; + rev = "v${version}"; + sha256 = "1h45xjms56radhknspyx17a12dpnm7xgqm1x1chy42aw5ic8b5qf"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libpng + zlib + giflib + libjpeg + SDL2 + ]; + + meta = with stdenv.lib; { + description = "A simple library for loading/saving images and animations, written in C"; + homepage = "https://github.com/bcampbell/impy"; + license = licenses.gpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c62d3ed96f4..121b7312561d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12416,6 +12416,8 @@ in imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ; + impy = callPackage ../development/libraries/impy { }; + ineffassign = callPackage ../development/tools/ineffassign { }; ijs = callPackage ../development/libraries/ijs { }; From 21720b4c9325092aafecd80b6d657a6d7306ec08 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 15 Jun 2020 18:43:39 +0200 Subject: [PATCH 306/624] evilpixie: init at 0.2 --- .../graphics/evilpixie/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/graphics/evilpixie/default.nix diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix new file mode 100644 index 000000000000..1f6a52aa0b0c --- /dev/null +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -0,0 +1,59 @@ +{ mkDerivation +, lib +, fetchFromGitHub +, makeDesktopItem +, qmake +, qtbase +, libpng +, giflib +, impy +}: + +let + desktopItem = makeDesktopItem { + name = "EvilPixie"; + desktopName = "EvilPixie"; + exec = "evilpixie %F"; + icon = "evilpixie"; + genericName = "Image Editor"; + categories = "Graphics;2DGraphics;RasterGraphics;"; + mimeType = "image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/x-pcx;image/x-targa;image/x-tga;"; + }; + +in mkDerivation rec { + pname = "evilpixie"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "bcampbell"; + repo = "evilpixie"; + rev = "v${version}"; + sha256 = "1yg4ic3kcxqmr7k5bbvrv5iavlnhpdx6510z5wha9k9k5q9c4dvh"; + }; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtbase + libpng + giflib + impy + ]; + + postInstall = '' + ln -s ${desktopItem}/share/applications $out/share + install -Dm 444 icon_128x128.png $out/share/icons/hicolor/128x128/apps/evilpixie.png + ''; + + meta = with lib; { + description = "Pixel-oriented paint program, modelled on Deluxe Paint"; + homepage = "http://evilpixie.scumways.com/"; + downloadPage = "https://github.com/bcampbell/evilpixie/releases"; + license = licenses.gpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 121b7312561d..d1a9109721fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19413,6 +19413,8 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); + evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + exercism = callPackage ../applications/misc/exercism { }; go-motion = callPackage ../development/tools/go-motion { }; From 83f56d4ccbf57562051aaedb8c8b3b59a0eb712a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 16 Jun 2020 01:35:17 +0000 Subject: [PATCH 307/624] gmic: 2.9.0 -> 2.9.1 --- pkgs/tools/graphics/gmic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 610c1306ecfd..b167a73466de 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.0"; + version = "2.9.1"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1df4x1dadf5llf8r0845vr2bv4pin2079an3gk69v697kdgnjcv2"; + sha256 = "13axx7nwchn6ysgpvlw3fib474q4nrwv3qn20g3q03ldid0xvjah"; }; nativeBuildInputs = [ From 912a58428c71ca73426c25c9d4eac69f119a0517 Mon Sep 17 00:00:00 2001 From: James Kay Date: Tue, 16 Jun 2020 20:44:10 +0100 Subject: [PATCH 308/624] libinput: ensure that we only apply touchpad options to touchpads --- nixos/modules/services/x11/hardware/libinput.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 9548ecb8ef6d..48543d15499b 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -219,6 +219,7 @@ in { Section "InputClass" Identifier "libinputConfiguration" MatchDriver "libinput" + MatchTag "Touchpad" ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Option "AccelProfile" "${cfg.accelProfile}" ${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''} From e5055647e6680389ccb5d0d21f98dcf02756cdce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Jun 2020 09:39:19 +0000 Subject: [PATCH 309/624] pgbouncer: 1.13.0 -> 1.14.0 --- pkgs/servers/sql/pgbouncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 0a6d1a8cf613..e824298c4886 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c"; + sha256 = "1rzy06hqzhnijm32vah9icgrx95pmf9iglvyzwv7wmcg2h83vhd0"; }; nativeBuildInputs = [ pkg-config ]; From 3068eb8e90bc8037dc8a760d1aea99c2162e5154 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Wed, 17 Jun 2020 13:26:03 +0200 Subject: [PATCH 310/624] faad2: 2.8.8 -> 2.9.2 - change upstream to GitHub - use autoreconfHook Fixes: https://nvd.nist.gov/vuln/detail/CVE-2019-6956 Changelog: https://github.com/knik0/faad2/blob/2_9_2/ChangeLog --- pkgs/development/libraries/faad2/default.nix | 38 +++++--------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 1a6d67ba8052..7040ad0f4510 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -1,44 +1,24 @@ -{stdenv, fetchurl +{stdenv, fetchFromGitHub, autoreconfHook , drmSupport ? false # Digital Radio Mondiale }: with stdenv.lib; stdenv.mkDerivation rec { pname = "faad2"; - version = "2.8.8"; + version = "2.9.2"; - src = fetchurl { - url = "mirror://sourceforge/faac/${pname}-${version}.tar.gz"; - sha256 = "1db37ydb6mxhshbayvirm5vz6j361bjim4nkpwjyhmy4ddfinmhl"; + src = fetchFromGitHub { + owner = "knik0"; + repo = "faad2"; + rev = builtins.replaceStrings [ "." ] [ "_" ] version; + sha256 = "0rdi6bmyryhkwf4mpprrsp78m6lv1nppav2f0lf1ywifm92ng59c"; }; - patches = let - fp = { ver ? "2.8.8-3", pname, name ? (pname + ".patch"), sha256 }: fetchurl { - url = "https://salsa.debian.org/multimedia-team/faad2/raw/debian/${ver}" - + "/debian/patches/${pname}.patch?inline=false"; - inherit name sha256; - }; - in [ - (fp { - # critical bug addressed in vlc 3.0.7 (but we use system-provided faad) - pname = "0004-Fix-a-couple-buffer-overflows"; - sha256 = "1mwycdfagz6wpda9j3cp7lf93crgacpa8rwr58p3x0i5cirnnmwq"; - }) - (fp { - name = "CVE-2018-20362.patch"; - pname = "0009-syntax.c-check-for-syntax-element-inconsistencies"; - sha256 = "1z849l5qyvhyn5pvm6r07fa50nrn8nsqnrka2nnzgkhxlhvzpa81"; - }) - (fp { - name = "CVE-2018-20194.patch"; - pname = "0010-sbr_hfadj-sanitize-frequency-band-borders"; - sha256 = "1b1kbz4mv0zhpq8h3djnvqafh1gn12nikk9v3jrxyryywacirah4"; - }) - ]; - configureFlags = [] ++ optional drmSupport "--with-drm"; + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = "https://www.audiocoding.com/faad2.html"; From 1ae9228fb603402778b49ce709edbf2ae8fcf49d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 18 Jun 2020 00:46:43 +0300 Subject: [PATCH 311/624] whitebox-tools: 1.2.0 -> 1.3.0 --- pkgs/applications/gis/whitebox-tools/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index d81a08e29008..c26243c0c59b 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,25 +1,22 @@ { stdenv, rustPlatform , fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "jblindsay"; repo = "whitebox-tools"; rev = "v${version}"; - sha256 = "0zi32d0wrbl2763dcllv2g0liwacsfiza5lkx52620prjjbhby8i"; + sha256 = "0c9jmfjz6ys65y65zlllv9xvaaavr9jpqc1dc217iywhj07j8k2v"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "13k21akyfqgamywj39bw73sldby1s02vyvxfglxbaqq1x96xcy4i"; - - # failures: structures::polyline::test::test_polyline_split - doCheck = false; + cargoSha256 = "05w2jimmygg7dc93i8bpjpjc5yj5xfpfkjnbbgw2sq4kh06r5ii4"; meta = with stdenv.lib; { description = "An advanced geospatial data analysis platform"; - homepage = "http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html"; + homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; license = licenses.mit; maintainers = [ maintainers.mpickering ]; platforms = platforms.all; From 343f689854200a2e40b9701623cc47af661633d4 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 21 May 2020 12:25:12 +0200 Subject: [PATCH 312/624] pythonPackage.tls-parser: init at 1.2.2 --- .../python-modules/tls-parser/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/tls-parser/default.nix diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix new file mode 100644 index 000000000000..5b6bfe6a0e28 --- /dev/null +++ b/pkgs/development/python-modules/tls-parser/default.nix @@ -0,0 +1,29 @@ +{ lib +, isPy27 +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tls-parser"; + version = "1.2.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "nabla-c0d3"; + repo = "tls_parser"; + rev = version; + sha256 = "12qj3vg02r5a51w6gbgb1gcxicqc10lbbsdi57jkkfvbqiindbd0"; + }; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/nabla-c0d3/tls_parser"; + description = "Small library to parse TLS records"; + platforms = with platforms; linux ++ darwin; + license = licenses.mit; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 331f7292b930..e91be307fd3e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1583,6 +1583,8 @@ in { tesserocr = callPackage ../development/python-modules/tesserocr { }; + tls-parser = callPackage ../development/python-modules/tls-parser { }; + trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme {}; From 9a243a6cd2e2b7545add8d258e9e3bbd6832a0cc Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 21 May 2020 12:27:42 +0200 Subject: [PATCH 313/624] python3Package.nassl: init at 3.0.0 --- .../python-modules/nassl/default.nix | 120 ++++++++++++++++++ .../nassl/nix-ssl-cert-file.patch | 14 ++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 136 insertions(+) create mode 100644 pkgs/development/python-modules/nassl/default.nix create mode 100644 pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix new file mode 100644 index 000000000000..08cfb66408d2 --- /dev/null +++ b/pkgs/development/python-modules/nassl/default.nix @@ -0,0 +1,120 @@ +{ lib +, fetchFromGitHub +, fetchurl +, buildPythonPackage +, pkgsStatic +, openssl +, invoke +, pytest +, tls-parser +, cacert +}: + +let + zlibStatic = pkgsStatic.zlib; + nasslOpensslArgs = { + static = true; + enableSSL2 = true; + }; + nasslOpensslFlagsCommon = [ + "zlib" + "no-zlib-dynamic" + "no-shared" + "--with-zlib-lib=${zlibStatic.out}/lib" + "--with-zlib-include=${zlibStatic.out.dev}/include" + "enable-rc5" + "enable-md2" + "enable-gost" + "enable-cast" + "enable-idea" + "enable-ripemd" + "enable-mdc2" + "-fPIC" + ]; + opensslStatic = (openssl.override nasslOpensslArgs).overrideAttrs ( + oldAttrs: rec { + name = "openssl-${version}"; + version = "1.1.1"; + src = fetchurl { + url = "https://www.openssl.org/source/${name}.tar.gz"; + sha256 = "0gbab2fjgms1kx5xjvqx8bxhr98k4r8l2fa8vw7kvh491xd8fdi8"; + }; + configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [ + "enable-weak-ssl-ciphers" + "enable-tls1_3" + "no-async" + ]; + patches = [ ./nix-ssl-cert-file.patch ]; + buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; + } + ); + opensslLegacyStatic = (openssl.override nasslOpensslArgs).overrideAttrs ( + oldAttrs: rec { + name = "openssl-${version}"; + version = "1.0.2e"; + src = fetchurl { + url = "https://www.openssl.org/source/${name}.tar.gz"; + sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; + }; + configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon; + patches = [ ]; + buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ]; + # openssl_1_0_2 needs `withDocs = false` + outputs = lib.remove "doc" oldAttrs.outputs; + } + ); +in +buildPythonPackage rec { + pname = "nassl"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "nabla-c0d3"; + repo = pname; + rev = version; + sha256 = "1dhgkpldadq9hg5isb6mrab7z80sy5bvzad2fb54pihnknfwhp8z"; + }; + + postPatch = '' + mkdir -p deps/openssl-OpenSSL_1_0_2e/ + cp ${opensslLegacyStatic.out}/lib/libssl.a \ + ${opensslLegacyStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_1_0_2e/ + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps + + mkdir -p deps/openssl-OpenSSL_1_1_1/ + cp ${opensslStatic.out}/lib/libssl.a \ + ${opensslStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_1_1_1/ + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include + ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps + + mkdir -p deps/zlib-1.2.11/ + cp ${zlibStatic.out}/lib/libz.a deps/zlib-1.2.11/ + ''; + + propagatedBuildInputs = [ tls-parser ]; + + nativeBuildInputs = [ invoke ]; + + buildPhase = '' + invoke build.nassl + invoke package.wheel + ''; + + checkInputs = [ pytest ]; + + checkPhase = '' + # Skip online tests + pytest -k 'not Online' + ''; + + meta = with lib; { + homepage = "https://github.com/nabla-c0d3/nassl"; + description = "Low-level OpenSSL wrapper for Python 3.7+"; + platforms = with platforms; linux ++ darwin; + license = licenses.agpl3; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch b/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch new file mode 100644 index 000000000000..893fb3eb6643 --- /dev/null +++ b/pkgs/development/python-modules/nassl/nix-ssl-cert-file.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c +--- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 ++++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 +@@ -97,7 +97,9 @@ + switch (cmd) { + case X509_L_FILE_LOAD: + if (argl == X509_FILETYPE_DEFAULT) { +- file = getenv(X509_get_default_cert_file_env()); ++ file = getenv("NIX_SSL_CERT_FILE"); ++ if (!file) ++ file = getenv(X509_get_default_cert_file_env()); + if (file) + ok = (X509_load_cert_crl_file(ctx, file, + X509_FILETYPE_PEM) != 0); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e91be307fd3e..161ad54f2751 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -969,6 +969,8 @@ in { nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nassl = callPackage ../development/python-modules/nassl { }; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; nbsphinx = callPackage ../development/python-modules/nbsphinx { }; From 9ec1297d8a54786138065850687cfd4dc5cb020f Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Thu, 21 May 2020 12:33:16 +0200 Subject: [PATCH 314/624] python3Package.sslyze: init at 3.0.7 --- .../python-modules/sslyze/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/sslyze/default.nix diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix new file mode 100644 index 000000000000..78824515a45d --- /dev/null +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, pytest +, buildPythonPackage +, nassl +, cryptography +, typing-extensions +, faker +}: + +buildPythonPackage rec { + pname = "sslyze"; + version = "3.0.7"; + + src = fetchFromGitHub { + owner = "nabla-c0d3"; + repo = pname; + rev = version; + sha256 = "1ahwldsh3xvagin09dy5q73bdw5k4siqy2qqgxwj4wdyd7pjb4p9"; + }; + + patchPhase = '' + substituteInPlace setup.py \ + --replace "cryptography>=2.6,<=2.9" "cryptography>=2.6,<=3" + ''; + + checkInputs = [ pytest ]; + + checkPhase = '' + # Most of the tests are online; hence, applicable tests are listed + # explicitly here + pytest \ + tests/test_main.py \ + tests/test_scanner.py \ + tests/cli_tests/test_console_output.py \ + tests/cli_tests/test_json_output.py \ + tests/cli_tests/test_server_string_parser.py \ + tests/plugins_tests/test_scan_commands.py \ + tests/plugins_tests/certificate_info/test_certificate_utils.py \ + -k "not (TestScanner and test_client_certificate_missing)" + ''; + + propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; + + meta = with lib; { + homepage = "https://github.com/nabla-c0d3/sslyze"; + description = "Fast and powerful SSL/TLS scanning library"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.agpl3; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a0bb8018efe..40f296dc98fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22253,6 +22253,8 @@ in git = gitMinimal; }; + sslyze = with python3Packages; toPythonApplication sslyze; + ssr = callPackage ../applications/audio/soundscape-renderer {}; ssrc = callPackage ../applications/audio/ssrc { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 161ad54f2751..be1fc772bac9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1555,6 +1555,8 @@ in { sslib = callPackage ../development/python-modules/sslib { }; + sslyze = callPackage ../development/python-modules/sslyze { }; + statistics = callPackage ../development/python-modules/statistics { }; stm32loader = callPackage ../development/python-modules/stm32loader { }; From 04570e620dea83aaac9e539eccfbde81400bf3cc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 19 Jun 2020 00:10:15 +0200 Subject: [PATCH 315/624] gitea: 1.11.6 -> 1.12.0 https://github.com/go-gitea/gitea/releases/tag/v1.12.0 --- pkgs/applications/version-management/gitea/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 21ff7c5f8f9d..9ca29096882e 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,6 +1,5 @@ { stdenv, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam -, fetchpatch , sqliteSupport ? true , pamSupport ? true }: @@ -9,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.11.6"; + version = "1.12.0"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "11nyq5faq0hy1pi3yhmc6y8is7jyiyfrb162fq9l33pkyw6qihqs"; + sha256 = "1nsi7d2jackkjvinp5wglrzb61f2hihrn6qgwlp1zb185k2qpd23"; }; unpackPhase = '' @@ -25,10 +24,6 @@ buildGoPackage rec { patches = [ ./static-root-path.patch - (fetchpatch { - url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch"; - sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i"; - }) ]; postPatch = '' From b7a9229b8fc778e27c62a36b71c1924961ebb3d7 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 18 Jun 2020 14:17:16 +0200 Subject: [PATCH 316/624] WasabiBackend: init at 1.1.11.1 --- .../blockchains/wasabibackend/create_deps.sh | 98 ++ .../blockchains/wasabibackend/default.nix | 100 ++ .../blockchains/wasabibackend/deps.nix | 951 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 1151 insertions(+) create mode 100644 pkgs/applications/blockchains/wasabibackend/create_deps.sh create mode 100644 pkgs/applications/blockchains/wasabibackend/default.nix create mode 100644 pkgs/applications/blockchains/wasabibackend/deps.nix diff --git a/pkgs/applications/blockchains/wasabibackend/create_deps.sh b/pkgs/applications/blockchains/wasabibackend/create_deps.sh new file mode 100644 index 000000000000..814f92a341a6 --- /dev/null +++ b/pkgs/applications/blockchains/wasabibackend/create_deps.sh @@ -0,0 +1,98 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p dotnet-sdk_3 nixfmt + +# Run this script to generate deps.nix +# ./create_deps.sh /path/to/package/source/checkout > deps.nix + +# TODO: consolidate with other dotnet deps generation scripts by which +# this script is inspired: +# - pkgs/servers/nosql/eventstore/create-deps.sh +# - pkgs/development/dotnet-modules/python-language-server/create_deps.sh + +URLBASE="https://www.nuget.org/api/v2/package" + +DEPS_HEADER=" +{ fetchurl }: +let + nugetUrlBase = \"$URLBASE\"; + fetchNuGet = { name, version, sha256 }: fetchurl { + inherit sha256; + url = \"\${nugetUrlBase}/\${name}/\${version}\"; + }; +in [" + +DEPS_FOOTER="]" + +DEPS_TEMPLATE=" +(fetchNuGet { + name = \"%s\"; + version = \"%s\"; + sha256 = \"%s\"; +})" + + +function generate_restore_log() { + checkout_path=$1 + >&2 echo "generating restore log for $checkout_path..." + cd $checkout_path + dotnet nuget locals all --clear + dotnet restore -v normal --no-cache WalletWasabi.Backend -r linux-x64 + cd - +} + +function process_restore_log() { + restore_log=$1 + >&2 echo "processing restore log..." + while read line; do + if echo $line | grep -q "^[[:space:]]*Installing"; then + l=$(echo $line | xargs) + l=${l#Installing } + l=${l%.} + echo $l + fi + done < $restore_log +} + +function prefetch_deps() { + processed_log=$1 + >&2 echo "prefetching deps..." + while read line; do + name=$(echo $line | cut -d' ' -f1) + >&2 echo "prefetching '$name' version: $version" + version=$(echo $line | cut -d' ' -f2) + hash=$(nix-prefetch-url "$URLBASE/$name/$version" 2>/dev/null) + echo "$name $version $hash" + done < $processed_log +} + +function generate_deps_expression() { + packages=$1 + >&2 echo "generating deps nix-expression..." + echo $DEPS_HEADER + while read line; do + name=$(echo $line | cut -d' ' -f1) + version=$(echo $line | cut -d' ' -f2) + hash=$(echo $line | cut -d' ' -f3) + printf "$DEPS_TEMPLATE" $name $version $hash + done < $packages + echo $DEPS_FOOTER +} + +function main() { + checkout_path=$1 + tmpdir=$(mktemp -d) + generate_restore_log $checkout_path > $tmpdir/restore.log + process_restore_log $tmpdir/restore.log > $tmpdir/processed.log + prefetch_deps $tmpdir/processed.log > $tmpdir/prefetched.log + generate_deps_expression $tmpdir/prefetched.log > $tmpdir/deps.nix + nixfmt $tmpdir/deps.nix + cat $tmpdir/deps.nix + rm -rf $tmpdir +} + +if [ ! -d "$1" ]; then + >&2 echo "First argument must be a directory, the path to the package source checkout" + exit 1 +fi + +main $@ diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix new file mode 100644 index 000000000000..0324f0244239 --- /dev/null +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -0,0 +1,100 @@ +{ stdenv +, fetchFromGitHub +, fetchurl +, makeWrapper +, Nuget +, dotnetCorePackages +, openssl +, zlib +}: + +let + deps = import ./deps.nix { inherit fetchurl; }; + + dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_3_1; + + nugetSource = stdenv.mkDerivation { + pname = "${pname}-nuget-deps"; + inherit version; + + dontUnpack = true; + dontInstall = true; + + nativeBuildInputs = [ Nuget ]; + + buildPhase = '' + export HOME=$(mktemp -d) + mkdir -p $out/lib + + nuget sources Disable -Name "nuget.org" + for package in ${toString deps}; do + nuget add $package -Source $out/lib + done + ''; + }; + + pname = "WasabiBackend"; + version = "1.1.11.1"; + + projectName = "WalletWasabi.Backend"; + projectConfiguration = "Release"; + projectRuntime = "linux-x64"; +in + +stdenv.mkDerivation rec { + inherit pname version; + + src = fetchFromGitHub { + owner = "zkSNACKs"; + repo = "WalletWasabi"; + rev = "v${version}"; + sha256 = "0kxww8ywhld00b0qsv5jh5s19jqpahnb9mvshmjnp3cb840j12a7"; + }; + + buildInputs = [ + Nuget + dotnet-sdk + makeWrapper + ]; + + buildPhase = '' + export HOME=$(mktemp -d) + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_ROOT="${dotnet-sdk}/bin" + + nuget sources Disable -Name "nuget.org" + + dotnet restore \ + --source ${nugetSource}/lib \ + --runtime ${projectRuntime} \ + ${projectName} + + dotnet publish \ + --no-restore \ + --runtime ${projectRuntime} \ + --configuration ${projectConfiguration} \ + ${projectName} + ''; + + installPhase = '' + mkdir -p $out + cp -r ${projectName}/bin/${projectConfiguration}/netcoreapp3.1/${projectRuntime}/publish $out/lib + mkdir -p $out/bin + makeWrapper $out/lib/WalletWasabi.Backend $out/bin/${pname} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl zlib ]} \ + --run "cd $out/lib" + ''; + + # If we don't disable stripping the executable fails to start with segfault + dontStrip = true; + + meta = with stdenv.lib; { + description = "Backend for the Wasabi Wallet"; + homepage = "https://wasabiwallet.io/"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix new file mode 100644 index 000000000000..ff5184ba860c --- /dev/null +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -0,0 +1,951 @@ +{ fetchurl }: +let + nugetUrlBase = "https://www.nuget.org/api/v2/package"; + fetchNuGet = { name, version, sha256 }: + fetchurl { + inherit sha256; + url = "${nugetUrlBase}/${name}/${version}"; + }; +in [ + + (fetchNuGet { + name = "System.Xml.XmlSerializer"; + version = "4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) + (fetchNuGet { + name = "System.Threading.Overlapped"; + version = "4.0.1"; + sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; + }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.0.1"; + sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "System.Private.DataContractSerialization"; + version = "4.1.1"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.0.0"; + sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.0.1"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + }) + (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.OpenSsl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "runtime.native.System.Net.Http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "runtime.native.System.IO.Compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Physical"; + version = "2.0.0"; + sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; + }) + (fetchNuGet { + name = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts"; + version = "2.0.2"; + sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App"; + version = "2.0.5"; + sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; + }) + (fetchNuGet { + name = "Microsoft.VisualStudio.Web.CodeGeneration.Tools"; + version = "2.0.2"; + sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6"; + }) + (fetchNuGet { + name = "NuGet.Frameworks"; + version = "4.0.0"; + sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "System.Buffers"; + version = "4.0.0"; + sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; + }) + (fetchNuGet { + name = "Microsoft.Build.Runtime"; + version = "15.3.409"; + sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "10.0.1"; + sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileSystemGlobbing"; + version = "2.0.0"; + sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; + }) + (fetchNuGet { + name = "runtime.native.System.Security.Cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.FileProviders.Abstractions"; + version = "2.0.0"; + sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "2.0.1"; + sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetHostPolicy"; + version = "2.0.5"; + sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "2.0.1"; + sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; + }) + (fetchNuGet { + name = "System.Globalization.Extensions"; + version = "4.3.0"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.3.0"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetAppHost"; + version = "2.0.5"; + sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.4.0"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }) + (fetchNuGet { + name = "System.IO.Pipes"; + version = "4.0.0"; + sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.3.0"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }) + (fetchNuGet { + name = "System.ComponentModel.TypeConverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }) + (fetchNuGet { + name = "System.Dynamic.Runtime"; + version = "4.3.0"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) + (fetchNuGet { + name = "NETStandard.Library"; + version = "1.6.0"; + sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; + }) + (fetchNuGet { + name = "Microsoft.Build.Framework"; + version = "15.3.409"; + sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; + }) + (fetchNuGet { + name = "Microsoft.Build.Tasks.Core"; + version = "15.3.409"; + sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933"; + }) + (fetchNuGet { + name = "Microsoft.Build.Utilities.Core"; + version = "15.3.409"; + sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; + }) + (fetchNuGet { + name = "System.Text.Encoding.CodePages"; + version = "4.0.1"; + sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; + }) + (fetchNuGet { + name = "Microsoft.Build"; + version = "15.3.409"; + sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Dataflow"; + version = "4.6.0"; + sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "2.0.0"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.DotNetHostResolver"; + version = "2.0.5"; + sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.3.0"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }) + (fetchNuGet { + name = "System.ComponentModel.Primitives"; + version = "4.3.0"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + }) + (fetchNuGet { + name = "System.ComponentModel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.3.0"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + }) + (fetchNuGet { + name = "System.Collections.Specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.ILGeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }) + (fetchNuGet { + name = "System.Reflection.Emit.Lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }) + (fetchNuGet { + name = "System.AppContext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + }) + (fetchNuGet { + name = "System.ObjectModel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "System.Collections.Concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + }) + (fetchNuGet { + name = "System.Net.Sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "System.Threading.Timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }) + (fetchNuGet { + name = "System.Globalization.Calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }) + (fetchNuGet { + name = "System.Diagnostics.Tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "System.Console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Reflection.Extensions"; + version = "4.0.1"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + }) + (fetchNuGet { + name = "System.IO.FileSystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }) + (fetchNuGet { + name = "System.Runtime.Numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "System.IO.Compression.ZipFile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) + (fetchNuGet { + name = "System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.Algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + }) + (fetchNuGet { + name = "System.Linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }) + (fetchNuGet { + name = "System.Text.Encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.IO.Compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Text.RegularExpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Xml.XDocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }) + (fetchNuGet { + name = "System.Net.Primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }) + (fetchNuGet { + name = "System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }) + (fetchNuGet { + name = "System.Security.Cryptography.X509Certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "System.Net.Http"; + version = "4.1.0"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + }) + (fetchNuGet { + name = "System.Xml.ReaderWriter"; + version = "4.0.11"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Threading.Thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + }) + (fetchNuGet { + name = "System.Diagnostics.TraceSource"; + version = "4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; + }) + (fetchNuGet { + name = "System.Reflection.TypeExtensions"; + version = "4.1.0"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }) + (fetchNuGet { + name = "System.Xml.XmlDocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; + version = "3.1.2"; + sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Runtime.linux-x64"; + version = "3.1.2"; + sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; + }) + (fetchNuGet { + name = "System.Collections.NonGeneric"; + version = "4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }) + (fetchNuGet { + name = "System.Resources.Reader"; + version = "4.0.0"; + sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; + }) + (fetchNuGet { + name = "System.Xml.XPath.XmlDocument"; + version = "4.0.1"; + sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.Platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }) + (fetchNuGet { + name = "Microsoft.CSharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + }) + (fetchNuGet { + name = "System.Xml.XPath"; + version = "4.0.1"; + sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + }) + (fetchNuGet { + name = "System.Security.Principal.Windows"; + version = "4.7.0"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }) + (fetchNuGet { + name = "System.Security.AccessControl"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.JsonPatch"; + version = "3.1.1"; + sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; + }) + (fetchNuGet { + name = "Newtonsoft.Json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + }) + (fetchNuGet { + name = "System.Resources.Writer"; + version = "4.0.0"; + sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; + }) + (fetchNuGet { + name = "System.Reflection.Metadata"; + version = "1.3.0"; + sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; + }) + (fetchNuGet { + name = "System.Collections.Immutable"; + version = "1.2.0"; + sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; + }) + (fetchNuGet { + name = "System.Linq.Parallel"; + version = "4.0.1"; + sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; + }) + (fetchNuGet { + name = "System.Diagnostics.Process"; + version = "4.1.0"; + sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; + }) + (fetchNuGet { + name = "System.Runtime.Serialization.Xml"; + version = "4.1.1"; + sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; + }) + (fetchNuGet { + name = "System.Threading.ThreadPool"; + version = "4.0.10"; + sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + }) + (fetchNuGet { + name = "System.Runtime.Loader"; + version = "4.0.0"; + sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; + }) + (fetchNuGet { + name = "System.Diagnostics.Contracts"; + version = "4.0.1"; + sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j"; + }) + (fetchNuGet { + name = "System.Diagnostics.FileVersionInfo"; + version = "4.0.0"; + sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3"; + }) + (fetchNuGet { + name = "NBitcoin.Secp256k1"; + version = "1.0.1"; + sha256 = "0j3a8iamqh06b7am6k8gh6d41zvrnmsif3525bw742jw5byjypdl"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; + version = "3.1.1"; + sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; + }) + (fetchNuGet { + name = "Newtonsoft.Json.Bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; + }) + (fetchNuGet { + name = "Microsoft.Win32.Registry"; + version = "4.7.0"; + sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + }) + (fetchNuGet { + name = "Microsoft.OpenApi"; + version = "1.1.4"; + sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3"; + }) + (fetchNuGet { + name = "NBitcoin"; + version = "5.0.29"; + sha256 = "0a6jvdvnf5h9j6c3ii3pdnkq79shmcm1hf6anaqcwvi3gq19chak"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore.SwaggerUI"; + version = "5.0.0"; + sha256 = "0d7vjq489rz208j6k3rb7vq6mzxzff3mqg83yk2rqy25vklrsbjd"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore"; + version = "5.0.0"; + sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore.SwaggerGen"; + version = "5.0.0"; + sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; + }) + (fetchNuGet { + name = "Microsoft.Extensions.ApiDescription.Server"; + version = "3.0.0"; + sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; + }) + (fetchNuGet { + name = "Swashbuckle.AspNetCore.Swagger"; + version = "5.0.0"; + sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; + }) + (fetchNuGet { + name = "runtime.unix.System.Private.Uri"; + version = "4.0.1"; + sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; + }) + (fetchNuGet { + name = "runtime.any.System.Text.Encoding"; + version = "4.0.11"; + sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; + }) + (fetchNuGet { + name = "runtime.any.System.Threading.Tasks"; + version = "4.0.11"; + sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; + }) + (fetchNuGet { + name = "System.Private.Uri"; + version = "4.0.1"; + sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; + }) + (fetchNuGet { + name = "runtime.any.System.Diagnostics.Tracing"; + version = "4.1.0"; + sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; + }) + (fetchNuGet { + name = "runtime.any.System.IO"; + version = "4.1.0"; + sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.Handles"; + version = "4.0.1"; + sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection.Primitives"; + version = "4.0.1"; + sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.1.0"; + sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; + }) + (fetchNuGet { + name = "runtime.any.System.Resources.ResourceManager"; + version = "4.0.1"; + sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; + }) + (fetchNuGet { + name = "runtime.any.System.Globalization"; + version = "4.0.11"; + sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; + }) + (fetchNuGet { + name = "runtime.any.System.Collections"; + version = "4.0.11"; + sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; + }) + (fetchNuGet { + name = "runtime.unix.System.Diagnostics.Debug"; + version = "4.0.11"; + sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; + }) + (fetchNuGet { + name = "runtime.unix.System.Runtime.Extensions"; + version = "4.1.0"; + sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; + }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.1.0"; + sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; + }) + (fetchNuGet { + name = "runtime.any.System.Runtime.InteropServices"; + version = "4.1.0"; + sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; + }) +] \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89817e1c9015..3cba56060b06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23391,6 +23391,8 @@ in wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; + wasabibackend = callPackage ../applications/blockchains/wasabibackend { Nuget = dotnetPackages.Nuget; }; + wownero = callPackage ../applications/blockchains/wownero.nix {}; zcash = callPackage ../applications/blockchains/zcash { }; From b62df8ab46788688ac30448d9f66e80df0acba47 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 18 Jun 2020 14:18:39 +0200 Subject: [PATCH 317/624] nixos/wasabibackend: init --- nixos/modules/module-list.nix | 1 + .../services/networking/wasabibackend.nix | 158 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 nixos/modules/services/networking/wasabibackend.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 978d33e75852..cc79d994244a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -756,6 +756,7 @@ ./services/networking/v2ray.nix ./services/networking/vsftpd.nix ./services/networking/wakeonlan.nix + ./services/networking/wasabibackend.nix ./services/networking/websockify.nix ./services/networking/wg-quick.nix ./services/networking/wicd.nix diff --git a/nixos/modules/services/networking/wasabibackend.nix b/nixos/modules/services/networking/wasabibackend.nix new file mode 100644 index 000000000000..e7d2a2c186e1 --- /dev/null +++ b/nixos/modules/services/networking/wasabibackend.nix @@ -0,0 +1,158 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.wasabibackend; + + inherit (lib) mkEnableOption mkIf mkOption optionalAttrs optionalString types; + + confOptions = { + BitcoinRpcConnectionString = "${cfg.rpc.user}:${cfg.rpc.password}"; + } // optionalAttrs (cfg.network == "mainnet") { + Network = "Main"; + MainNetBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}"; + MainNetBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}"; + } // optionalAttrs (cfg.network == "testnet") { + Network = "TestNet"; + TestNetBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}"; + TestNetBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}"; + } // optionalAttrs (cfg.network == "regtest") { + Network = "RegTest"; + RegTestBitcoinP2pEndPoint = "${cfg.endpoint.ip}:${toString cfg.endpoint.port}"; + RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}"; + }; + + configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions); + +in { + + options = { + + services.wasabibackend = { + enable = mkEnableOption "Wasabi backend service"; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/wasabibackend"; + description = "The data directory for the Wasabi backend node."; + }; + + customConfigFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Defines the path to a custom configuration file that is copied to the user's directory. Overrides any config options."; + }; + + network = mkOption { + type = types.enum [ "mainnet" "testnet" "regtest" ]; + default = "mainnet"; + description = "The network to use for the Wasabi backend service."; + }; + + endpoint = { + ip = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "IP address for P2P connection to bitcoind."; + }; + + port = mkOption { + type = types.port; + default = 8333; + description = "Port for P2P connection to bitcoind."; + }; + }; + + rpc = { + ip = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "IP address for RPC connection to bitcoind."; + }; + + port = mkOption { + type = types.port; + default = 8332; + description = "Port for RPC connection to bitcoind."; + }; + + user = mkOption { + type = types.str; + default = "bitcoin"; + description = "RPC user for the bitcoin endpoint."; + }; + + password = mkOption { + type = types.str; + default = "password"; + description = "RPC password for the bitcoin endpoint. Warning: this is stored in cleartext in the Nix store! Use configFile or passwordFile if needed."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "File that contains the password the the RPC user."; + }; + }; + + user = mkOption { + type = types.str; + default = "wasabibackend"; + description = "The user as which to run the wasabibackend node."; + }; + + group = mkOption { + type = types.str; + default = cfg.user; + description = "The group as which to run the wasabibackend node."; + }; + }; + }; + + config = mkIf cfg.enable { + + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -" + ]; + + systemd.services.wasabibackend = { + description = "wasabibackend server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + environment = { + DOTNET_PRINT_TELEMETRY_MESSAGE = "false"; + DOTNET_CLI_TELEMETRY_OPTOUT = "true"; + }; + preStart = '' + mkdir -p ${cfg.dataDir}/.walletwasabi/backend + ${if cfg.customConfigFile != null then '' + cp -v ${cfg.customConfigFile} ${cfg.dataDir}/.walletwasabi/backend/Config.json + '' else '' + cp -v ${configFile} ${cfg.dataDir}/.walletwasabi/backend/Config.json + ${optionalString (cfg.rpc.passwordFile != null) '' + CONFIGTMP=$(mktemp) + cat ${cfg.dataDir}/.walletwasabi/backend/Config.json | ${pkgs.jq}/bin/jq --arg rpconnection "${cfg.rpc.user}:$(cat "${cfg.rpc.passwordFile}")" '. + { BitcoinRpcConnectionString: $rpconnection }' > $CONFIGTMP + mv $CONFIGTMP ${cfg.dataDir}/.walletwasabi/backend/Config.json + ''} + ''} + chmod ug+w ${cfg.dataDir}/.walletwasabi/backend/Config.json + ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.wasabibackend}/bin/WasabiBackend"; + ProtectSystem = "full"; + }; + }; + + users.users.${cfg.user} = { + name = cfg.user; + group = cfg.group; + description = "wasabibackend daemon user"; + home = cfg.dataDir; + isSystemUser = true; + }; + + users.groups.${cfg.group} = {}; + + }; +} From 75e1819394e7bf22b8cdbdab5ff36ec2ad6b6256 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 18 Jun 2020 14:19:13 +0200 Subject: [PATCH 318/624] tests/wasabibackend: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/wasabibackend.nix | 38 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 nixos/tests/wasabibackend.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 796c626f3dde..ddbfedee7a8c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -341,6 +341,7 @@ in vault = handleTest ./vault.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; + wasabibackend = handleTest ./wasabibackend.nix {}; wireguard = handleTest ./wireguard {}; wordpress = handleTest ./wordpress.nix {}; xandikos = handleTest ./xandikos.nix {}; diff --git a/nixos/tests/wasabibackend.nix b/nixos/tests/wasabibackend.nix new file mode 100644 index 000000000000..d169ad152722 --- /dev/null +++ b/nixos/tests/wasabibackend.nix @@ -0,0 +1,38 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "wasabibackend"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mmahut ]; + }; + + nodes = { + machine = { ... }: { + services.wasabibackend = { + enable = true; + network = "testnet"; + rpc = { + user = "alice"; + port = 18332; + }; + }; + services.bitcoind = { + enable = true; + testnet = true; + rpc.users = { + alice.passwordHMAC = "e7096bc21da60b29ecdbfcdb2c3acc62$f948e61cb587c399358ed99c6ed245a41460b4bf75125d8330c9f6fcc13d7ae7"; + }; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("wasabibackend.service") + machine.wait_until_succeeds( + "grep 'Wasabi Backend started' /var/lib/wasabibackend/.walletwasabi/backend/Logs.txt" + ) + machine.sleep(5) + machine.succeed( + "grep 'Config is successfully initialized' /var/lib/wasabibackend/.walletwasabi/backend/Logs.txt" + ) + ''; +}) From 0dbc4721b53d74ff985765c47638907729c116a4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 19 Jun 2020 19:53:34 +0300 Subject: [PATCH 319/624] micro: 2.0.3 -> 2.0.5 --- pkgs/applications/editors/micro/default.nix | 12 ++++++++---- pkgs/applications/editors/micro/deps.nix | 8 ++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index 6a1ee5d196ee..438dec91d47d 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,21 +2,25 @@ buildGoPackage rec { pname = "micro"; - version = "2.0.3"; + version = "2.0.5"; goPackagePath = "github.com/zyedidia/micro"; src = fetchFromGitHub { owner = "zyedidia"; - repo = "micro"; + repo = pname; rev = "v${version}"; - sha256 = "017m9kb3gfrgzd06f1nma1i3m5rb0hzpgdikb86lsyv8ik18y12z"; + sha256 = "12fyyax1mr0n82s5yhmk90iyyzbh32rppkkpj37c25pal73czdhc"; fetchSubmodules = true; }; subPackages = [ "cmd/micro" ]; - buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/internal/util.Version=${version}" ]; + buildFlagsArray = let t = "${goPackagePath}/internal/util"; in '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.CommitHash=${src.rev} + ''; goDeps = ./deps.nix; diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix index e8ed69a9088b..c274ce80ada1 100644 --- a/pkgs/applications/editors/micro/deps.nix +++ b/pkgs/applications/editors/micro/deps.nix @@ -203,8 +203,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/clipboard"; - rev = "241f98e9b197"; - sha256 = "1glc8w30sijpbppcvaf3503rmx5nxqkcgw87dr2pr3q3vv1bg3zi"; + rev = "7c45b8673834"; + sha256 = "0ag36wd3830d4s6fvpj05v6f662c5rymgdydsj2gq8aaqplfb0v4"; }; } { @@ -257,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/zyedidia/tcell"; - rev = "v1.4.4"; - sha256 = "0d62a9csab15b64y09jcbvq71065wliw4bd5m7lfpl5k8rmrrdyi"; + rev = "v1.4.7"; + sha256 = "1ddaznp0haz35mxfjjh2fmamdrlk1igqg65fz22l5r6vvhcdsfxa"; }; } { From d07ba3e96281ef7713eb1f91b0ba8bc7b3886b8d Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Fri, 19 Jun 2020 20:07:55 +0200 Subject: [PATCH 320/624] nixos/wasabibackend: fixing description Co-authored-by: 1000101 --- nixos/modules/services/networking/wasabibackend.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wasabibackend.nix b/nixos/modules/services/networking/wasabibackend.nix index e7d2a2c186e1..6eacffe709b0 100644 --- a/nixos/modules/services/networking/wasabibackend.nix +++ b/nixos/modules/services/networking/wasabibackend.nix @@ -90,7 +90,7 @@ in { passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = "File that contains the password the the RPC user."; + description = "File that contains the password of the RPC user."; }; }; From a6f7a8b010a7ab84a1ae1748122f949d5eb04641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 19 Jun 2020 20:24:05 +0200 Subject: [PATCH 321/624] clojure: install man pages Also move `makeWrapper` to `nativeBuildInputs`. --- pkgs/development/interpreters/clojure/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 91166d9bfd46..814af36811c7 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk11, rlwrap, makeWrapper }: +{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "06lg4z3q0fzxlbmx92g5qb0w3nw83dbwkzh3zjdy9ixrpm7b84i0"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; installPhase = let @@ -26,6 +29,8 @@ stdenv.mkDerivation rec { install -Dt $out/bin clj clojure wrapProgram $out/bin/clj --prefix PATH : $out/bin:${binPath} wrapProgram $out/bin/clojure --prefix PATH : $out/bin:${binPath} + + installManPage clj.1 clojure.1 ''; doInstallCheck = true; From ad13beeebc09d7e9987e5a6b7c7d4619170a9f75 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 19 Jun 2020 15:15:33 -0400 Subject: [PATCH 322/624] nixos/resilio: fix group name in documentation --- nixos/modules/services/networking/resilio.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index e74e03fc0b07..004abc48219a 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -206,16 +206,16 @@ in If you would like to be able to modify the contents of this directories, it is recommended that you make your user a - member of the resilio group. + member of the rslsync group. Directories in this list should be in the - resilio group, and that group must have + rslsync group, and that group must have write access to the directory. It is also recommended that chmod g+s is applied to the directory so that any sub directories created will also belong to - the resilio group. Also, - setfacl -d -m group:resilio:rwx and - setfacl -m group:resilio:rwx should also + the rslsync group. Also, + setfacl -d -m group:rslsync:rwx and + setfacl -m group:rslsync:rwx should also be applied so that the sub directories are writable by the group. ''; From 73f7453bfbfcc63571011a8adf586cea146e4ff7 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Fri, 19 Jun 2020 20:03:41 +0100 Subject: [PATCH 323/624] pythonPackages.psutil: fix fix for darwin build PR #82524 correctly diagnosed the problem, but slightly fluffed the boolean logic (disable tests for Darwin as well as non-x86_64 arch). --- pkgs/development/python-modules/psutil/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 8e479dfaca25..69181af222c9 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # arch doesn't report frequency is the same way # tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715 - doCheck = stdenv.isDarwin || stdenv.isx86_64; + doCheck = !stdenv.isDarwin && stdenv.isx86_64; checkInputs = [ pytest ] ++ lib.optionals isPy27 [ mock ipaddress ]; # out must be referenced as test import paths are relative From 5a3546120c7b8cecb8e5f9cf55e473396efc32c8 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Fri, 19 Jun 2020 20:11:32 +0100 Subject: [PATCH 324/624] python: aiohttp: fix darwin build Disable a non-critical test known to fail on Darwin (see https://github.com/aio-libs/aiohttp/issues/3572) --- pkgs/development/python-modules/aiohttp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index c58944a59d72..9dcd34c1d1be 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -62,6 +62,7 @@ buildPythonPackage rec { "test_read_incomplete_chunk" "test_request_tracing_exception" ] ++ lib.optionals stdenv.isDarwin [ + "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572 "test_close" ]; From 084d3da828f433562863af542f5ce7bcd9070cfe Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Fri, 19 Jun 2020 20:14:54 +0100 Subject: [PATCH 325/624] python: uvloop: fix darwin build Skip tests that fail on Darwin --- pkgs/development/python-modules/uvloop/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 109d8d8efab2..567846b0aefd 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -55,6 +55,9 @@ buildPythonPackage rec { export TEST_DIR=$(mktemp -d) cp -r tests $TEST_DIR pushd $TEST_DIR + '' + lib.optionalString stdenv.isDarwin '' + # Some tests fail on Darwin + rm tests/test_[stu]*.py ''; postCheck = '' popd From ca2ed565634d5c6ef2e6cc5aebaaf500ec5f28c5 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Fri, 19 Jun 2020 21:20:42 +0200 Subject: [PATCH 326/624] bitcoind-knots: init at 0.20.0 --- .../blockchains/bitcoin-knots.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/blockchains/bitcoin-knots.nix diff --git a/pkgs/applications/blockchains/bitcoin-knots.nix b/pkgs/applications/blockchains/bitcoin-knots.nix new file mode 100644 index 000000000000..384ac880fe14 --- /dev/null +++ b/pkgs/applications/blockchains/bitcoin-knots.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, autoreconfHook +, db5 +, openssl +, boost +, zlib +, miniupnpc +, libevent +, protobuf +, utillinux +}: + +stdenv.mkDerivation rec { + pname = "bitcoind-knots"; + version = "0.20.0"; + versionDate = "20200614"; + + src = fetchFromGitHub { + owner = "bitcoinknots"; + repo = "bitcoin"; + rev = "v${version}.knots${versionDate}"; + sha256 = "0c8k1154kcwz6q2803wx0zigvqaij1fi5akgfqlj3yl57jjw48jj"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db5 openssl utillinux + protobuf boost zlib miniupnpc libevent ]; + + configureFlags = [ "--with-incompatible-bdb" + "--with-boost-libdir=${boost.out}/lib" ]; + + meta = with stdenv.lib; { + description = "An enhanced Bitcoin node software"; + homepage = "https://bitcoinknots.org/"; + license = licenses.mit; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4a2e72fe4fb..c394051a7f1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23409,6 +23409,9 @@ in bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; bitcoind = callPackage ../applications/blockchains/bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; + + bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; From a2a5aa26349667be58dbf73520d2e78c9ea15a55 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Jun 2020 17:17:04 +0200 Subject: [PATCH 327/624] nextcloud19: init at 19.0.0 https://nextcloud.com/blog/nextcloud-hub-brings-productivity-to-home-office/ --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- pkgs/servers/nextcloud/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 5b9065dec3c5..7f57490287d8 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -69,7 +69,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud17" "nextcloud18" ]; + relatedPackages = [ "nextcloud17" "nextcloud18" "nextcloud19" ]; }; maxUploadSize = mkOption { diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 048de16ceed3..4c43f141d187 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -36,4 +36,9 @@ in { version = "18.0.6"; sha256 = "1chmkg31jc1nr53y8r886mmd2jzb78094mrx7ggcfpjfkkv8b89s"; }; + + nextcloud19 = generic { + version = "19.0.0"; + sha256 = "1bhazqj5f02sclh5pmifzqfahhhfqypixbvkgrnlgqy5ayb44gfj"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4a2e72fe4fb..9dc34703883c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5464,7 +5464,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud17 nextcloud18; + nextcloud17 nextcloud18 nextcloud19; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From 3077a7dc59a06d3918bcc92341fcd92251fbce04 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 19 Jun 2020 21:41:24 +0000 Subject: [PATCH 328/624] deno: 1.1.0 -> 1.1.1 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/deps.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 199d7f81fe0f..95778c2544cc 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "11rxfnjam1kr8piiw0s4r0qg8rj4qfpppp6dixk1hhsq2iwbnzj6"; + sha256 = "0034c2qp8sf6li7d38rnd6h9vhhi82p5rysm0pkrdhlmfqkqdgma"; fetchSubmodules = true; }; - cargoSha256 = "107i9zvlwiwad58c7lmh6zl9iwlqn1h8qk7zf7x68b6498p8nh7d"; + cargoSha256 = "1wbqxv2mzbs27j617a88gd7z0fjnjr2z1nklqfk49y62v8f1vsm1"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix index 9218e8ad97d2..32669a6111bc 100644 --- a/pkgs/development/web/deno/deps.nix +++ b/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.5.0"; + version = "0.5.1"; sha256s = { - x86_64-linux = "1jmrqf5ns2y51cxx9r88my15m6gc6wmg54xadi3kphq47n4hmdfw"; - aarch64-linux = "14v57pxpkz1fs483rbbc8k55rc4x41dqi0k12zdrjwa5ycdam3m5"; - x86_64-darwin = "0466px7k2zvbsswwcrr342i5ml669gf76xd8yzzypsmb7l71s6vr"; + x86_64-linux = "1gggnbki6b733qfx16gkqpplfsfmg1xv2a3nhh42xiykwsh987xl"; + aarch64-linux = "1an5ylm0w2x0dm34m9z6sld8f067f2rnsndr6mh6smp19jl889ma"; + x86_64-darwin = "1x1f5r8s8n00xag6d36j4h40rfc0r1w4wnmcr02sspzzkpyjxn2l"; }; }; } From d0cdf0c5287fdc66b66eae77019518518759ef13 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 19 Jun 2020 15:38:40 -0700 Subject: [PATCH 329/624] nomachine-client: 6.10.12 -> 6.11.2 --- pkgs/tools/admin/nomachine-client/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index a4d201fd4c4c..4657c64d3307 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,8 +1,8 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.10"; - versionMinor = "12"; + versionMajor = "6.11"; + versionMinor = "2"; versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in @@ -17,7 +17,7 @@ in "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" ]; - sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01"; + sha256 = "1b6r9bwkr8mhaljma19ikxpkmlx8iy5r1vf5hlv27bja2zz1r8xr"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { @@ -25,7 +25,7 @@ in "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" ]; - sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg"; + sha256 = "0dl138ry9n1qh651zh0zvp88qhgxrs2kvvnq329jw0py5v70b9pm"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; From 50afcee871382e7f9f5261c83d9f8c20feb99ed6 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 20 Jun 2020 02:14:04 +0200 Subject: [PATCH 330/624] ipfs: 0.5.1 -> 0.6.0 https://github.com/ipfs/go-ipfs/releases/tag/v0.6.0 --- pkgs/applications/networking/ipfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 8f141b0eade3..dbc6dc97ef20 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs"; - version = "0.5.1"; + version = "0.6.0"; rev = "v${version}"; # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "0lpilycjbc1g9adp4d5kryfprixj18hg3235fnivakmv7fy2akkm"; + sha256 = "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80"; }; # tarball contains multiple files/directories From 630454dfbe6f0a00f25c7ca38a07ff7773a85bb9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 20 Jun 2020 10:21:27 +1000 Subject: [PATCH 331/624] skopeo: 1.0.0 -> 1.1.0 https://github.com/containers/skopeo/releases/tag/v1.1.0 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 45b6867197ef..4bf87a2eda6f 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "1zg0agf8x7fa8zdzfzgncm64j363lmxrqjhdzsx6mlig87k17p05"; + sha256 = "1cxhwfrp5cjdq56vzy7gmidvm1z02f0rz2r1lv0d9ymnjlsjp9s3"; }; outputs = [ "out" "man" ]; From 7156cd1c3918f1533af6196bbeff615474d5aecc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 20 Jun 2020 01:17:46 +0000 Subject: [PATCH 332/624] libgpg-error: Fix cross build See comment for details Fixes #91016 --- pkgs/development/libraries/libgpg-error/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 1e49a72096a3..972ca4c04a57 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -34,6 +34,16 @@ in stdenv.mkDerivation (rec { '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h + '' + # This file was accidentally excluded from the sdist until + # 013720333c6ec1d38791689bc49ba039d98e16b3, post release. + # TODO make unconditional next mass rebuild + + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp ${fetchurl { + url = "https://raw.githubusercontent.com/gpg/libgpg-error/50e62b36ea01ed25d12c443088b85d4f41a2b3e1/src/gen-lock-obj.sh"; + sha256 = "10cslipa6npalj869asaamj0w941dhmx0yjafpyyh69ypsg2m2c3"; + }} ./src/gen-lock-obj.sh + chmod +x ./src/gen-lock-obj.sh ''; outputs = [ "out" "dev" "info" ]; From dca001e92312a4bc837f2a087c24fbea4069d8ca Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sat, 20 Jun 2020 14:22:34 +1200 Subject: [PATCH 333/624] nginx: change how the perl module is configured Previously, http_perl_module was disabled by overriding perl=null -- this means it is impossible to disable http_perl_module in openresty, since openresty requires perl for its configure scripts. --- pkgs/servers/http/nginx/generic.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 80bc1458ad7a..6ec5b0a78510 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -4,6 +4,7 @@ , withDebug ? false , withStream ? true , withMail ? false +, withPerl ? true , modules ? [] , ... }: @@ -87,7 +88,7 @@ stdenv.mkDerivation { ] ++ optionals withMail [ "--with-mail" "--with-mail_ssl_module" - ] ++ optional (perl != null) [ + ] ++ optionals withPerl [ "--with-http_perl_module" "--with-perl=${perl}/bin/perl" "--with-perl_modules_path=lib/perl5" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 072c892ccd60..7159c101d387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15847,14 +15847,14 @@ in nginx = nginxStable; nginxStable = callPackage ../servers/http/nginx/stable.nix { - perl = null; + withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; }; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { - perl = null; + withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.dav nginxModules.moreheaders ]; From 22906fc7a555ea67a5742b6d21a2af76da1fa518 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sat, 20 Jun 2020 14:27:50 +1200 Subject: [PATCH 334/624] openresty: disable the http_perl_module I have been experiencing intermittent segfaults inside the perl module on startup during config parsing, despite not actually using any perl features in my config. This creates consistency with the standard nginx packages, and the upstream openresty binaries. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7159c101d387..6620f56aef37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15884,7 +15884,9 @@ in openafs = callPackage ../servers/openafs/1.6 { tsmbac = null; ncurses = null; }; openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; }; - openresty = callPackage ../servers/http/openresty { }; + openresty = callPackage ../servers/http/openresty { + withPerl = false; + }; opensmtpd = callPackage ../servers/mail/opensmtpd { }; opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; From 732b3359b11b2534424f57dc6241a32feaa42633 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 20 Jun 2020 02:23:38 +0000 Subject: [PATCH 335/624] grab-site: use Python 3.7 to unbreak the build ludios_wpull depends on namedlist, which is incompatible with Python 3.8 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca857afc5eea..615ac0c3530e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12080,7 +12080,9 @@ in gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { }; + grab-site = callPackage ../tools/backup/grab-site { + python3Packages = python37Packages; + }; grib-api = callPackage ../development/libraries/grib-api { }; From 7606a2ad7969a67dd4e5641dd0ee2a389fc8f907 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sat, 20 Jun 2020 02:26:27 +0000 Subject: [PATCH 336/624] grab-site: 2.1.16 -> 2.1.19 --- pkgs/tools/backup/grab-site/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 64a711606f85..81e16ad005b2 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,14 +1,14 @@ { stdenv, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { - version = "2.1.16"; + version = "2.1.19"; name = "grab-site-${version}"; src = fetchFromGitHub { rev = version; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "01n3mi9q593sd2bbmbbp5pn2c3pkwj7iqmy02zbh8ciqskraja4z"; + sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; }; propagatedBuildInputs = with python3Packages; [ From 6b719544c6d041f331f634a5935d63eaa75e177d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 20 Jun 2020 07:04:58 +0200 Subject: [PATCH 337/624] home-assistant: pin the 'astral' dependency version --- pkgs/servers/home-assistant/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 33fbbf663102..e198a35ad121 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -27,6 +27,11 @@ let (mkOverride "colorlog" "4.0.2" "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42") + # required by the sun/moon plugins + # https://github.com/home-assistant/core/issues/36636 + (mkOverride "astral" "1.10.1" + "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") + # required by aioesphomeapi (self: super: { protobuf = super.protobuf.override { From 993ca7678ccbadbbc46b7a94e494bb694599b8d2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 20 Jun 2020 02:03:00 +0200 Subject: [PATCH 338/624] perlPackages.NetDBus: fix cross compilation Make Makefile.PL read the location to the `pkgconfig` binary from the `PKG_CONFIG` environment variable. --- pkgs/top-level/perl-packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e212da337696..b3e44398f6a6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13707,9 +13707,16 @@ let url = "mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz"; sha256 = "e7a1ac9ef4a1235b3fdbd5888f86c347182306467bd79abc9b0756a64b441cbc"; }; - nativeBuildInputs = [ pkgs.buildPackages.pkgconfig ]; + nativeBuildInputs = [ buildPackages.pkgconfig ]; buildInputs = [ pkgs.dbus TestPod TestPodCoverage ]; propagatedBuildInputs = [ XMLTwig ]; + + # https://gitlab.com/berrange/perl-net-dbus/-/merge_requests/19 + patches = (fetchpatch { + url = "https://gitlab.com/berrange/perl-net-dbus/-/commit/6bac8f188fb06e5e5edd27aee672d66b7c28caa4.patch"; + sha256 = "19nf4xn9xhyd0sd2az9iliqldjj0k6ah2dmkyqyvq4rp2d9k5jgb"; + }); + meta = { homepage = "http://www.freedesktop.org/wiki/Software/dbus"; description = "Extension for the DBus bindings"; From 7d994ad445e4a0dac23c651ddcabbece51e76619 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Sat, 20 Jun 2020 09:55:02 +0200 Subject: [PATCH 339/624] nixos/nextcloud: add occ internal option This option exposes the prefconfigured nextcloud-occ program. nextcloud-occ can then be used in other systemd services or added in environment.systemPackages. The nextcloud test shows how it can be add in environment.systemPackages. --- nixos/modules/services/web-apps/nextcloud.nix | 8 ++++++++ nixos/tests/nextcloud/basic.nix | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 5b9065dec3c5..8ce7bd521349 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -303,6 +303,14 @@ in { ''; }; }; + occ = mkOption { + type = types.package; + default = occ; + internal = true; + description = '' + The nextcloud-occ program preconfigured to target this Nextcloud instance. + ''; + }; }; config = mkIf cfg.enable (mkMerge [ diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 9cbecf01f57b..a8fa0cae6f0f 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -26,7 +26,9 @@ in { }; }; - nextcloud = { config, pkgs, ... }: { + nextcloud = { config, pkgs, ... }: let + cfg = config; + in { networking.firewall.allowedTCPPorts = [ 80 ]; services.nextcloud = { @@ -42,6 +44,8 @@ in { startAt = "20:00"; }; }; + + environment.systemPackages = [ cfg.services.nextcloud.occ ]; }; }; @@ -67,6 +71,8 @@ in { in '' start_all() nextcloud.wait_for_unit("multi-user.target") + # This is just to ensure the nextcloud-occ program is working + nextcloud.succeed("nextcloud-occ status") nextcloud.succeed("curl -sSf http://nextcloud/login") nextcloud.succeed( "${withRcloneEnv} ${copySharedFile}" From e2e115c03c3f32a46655157b2945af14cf4efb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 20 Jun 2020 11:08:21 +0200 Subject: [PATCH 340/624] python3Packages.srsly: disable on Python older than 3.6 Also add an import check. --- pkgs/development/python-modules/srsly/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 92e6b84afdfe..54590f2e35a6 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -15,6 +15,8 @@ buildPythonPackage rec { pname = "srsly"; version = "2.0.1"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "fa3c7375be8fe75f23c27feafbfb5f738d55ffdbf02964c6896fb7684f519a52"; @@ -22,8 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - propagatedBuildInputs = lib.optional (pythonOlder "3.4") pathlib; - checkInputs = [ mock numpy @@ -35,6 +35,8 @@ buildPythonPackage rec { # Possibly because of sandbox restrictions. doCheck = false; + pythonImportsCheck = [ "srsly" ]; + meta = with stdenv.lib; { description = "Modern high-performance serialization utilities for Python"; homepage = "https://github.com/explosion/srsly"; From cb11ab3bf6485c31a89673ba0fb26f4a5350f2cc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 Jun 2020 04:20:00 -0500 Subject: [PATCH 341/624] alacritty: fix build on darwin --- pkgs/applications/misc/alacritty/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 6bd35bd51eb3..a1f45fc7ed17 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -90,8 +90,6 @@ rustPlatform.buildRustPackage rec { --replace xdg-open ${xdg_utils}/bin/xdg-open ''; - postBuild = lib.optionalString stdenv.isDarwin "make app"; - installPhase = '' runHook preInstall @@ -100,7 +98,8 @@ rustPlatform.buildRustPackage rec { '' + ( if stdenv.isDarwin then '' mkdir $out/Applications - cp -r $releaseDir/osx/Alacritty.app $out/Applications/Alacritty.app + cp -r extra/osx/Alacritty.app $out/Applications + ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS '' else '' install -D extra/linux/Alacritty.desktop -t $out/share/applications/ install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg From f326e5a35e82574f6f7107bdd607dd703ec37a58 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 3 Jun 2020 18:57:14 +0200 Subject: [PATCH 342/624] nixos/nextcloud: update upgrade-path for nextcloud19 Enhance the heuristics to make sure that a user doesn't accidentally upgrade across two major versions of Nextcloud (e.g. from v17 to v19). The original idea/discussion has been documented in the nixpkgs manual[1]. This includes the following changes: * `nextcloud19` will be selected automatically when having a stateVersion greater or equal than 20.09. For existing setups, the package has to be selected manually to avoid accidental upgrades. * When using `nextcloud18` or older, a warning will be thrown which recommends upgrading to `nextcloud19`. * Added a brief paragraph about `nextcloud19` in the NixOS 19.09 release notes. * Restart `phpfpm` if the Nextcloud-package (`cfg.package`) changes[2]. [1] https://nixos.org/nixos/manual/index.html#module-services-nextcloud-maintainer-info [2] https://github.com/NixOS/nixpkgs/pull/89427#issuecomment-638885727 --- nixos/doc/manual/release-notes/rl-2009.xml | 10 ++++++++++ nixos/modules/services/web-apps/nextcloud.nix | 19 +++++++++++++++++-- nixos/modules/services/web-apps/nextcloud.xml | 6 ++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 9bbbecc05692..383a7981a835 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -642,6 +642,16 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; netbeans was upgraded to 12.0 and now defaults to OpenJDK 11. This might cause problems if your projects depend on packages that were removed in Java 11. + + + nextcloud has been updated to v19. + + + If you have an existing installation, please make sure that you're on + nextcloud18 before upgrading to nextcloud19 + since Nextcloud doesn't support upgrades across multiple major versions. + + diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 7f57490287d8..41269426e9e3 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -336,7 +336,16 @@ in { server, and wait until the upgrade to 17 is finished. Then, set `services.nextcloud.package` to `pkgs.nextcloud18` to upgrade to - Nextcloud version 18. + Nextcloud version 18. Please note that Nextcloud 19 is already out and it's + recommended to upgrade to nextcloud19 after that. + '') + ++ (optional (versionOlder cfg.package.version "19") '' + A legacy Nextcloud install (from before NixOS 20.09/unstable) may be installed. + + If/After nextcloud18 is installed successfully, you can safely upgrade to + nextcloud19. If not, please upgrade to nextcloud18 first since Nextcloud doesn't + support upgrades that skip multiple versions (i.e. an upgrade from 17 to 19 isn't + possible, but an upgrade from 18 to 19). ''); services.nextcloud.package = with pkgs; @@ -348,7 +357,8 @@ in { `pkgs.nextcloud`. '' else if versionOlder stateVersion "20.03" then nextcloud17 - else nextcloud18 + else if versionOlder stateVersion "20.09" then nextcloud18 + else nextcloud19 ); } @@ -360,6 +370,11 @@ in { }; systemd.services = { + # When upgrading the Nextcloud package, Nextcloud can report errors such as + # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly" + # Restarting phpfpm on Nextcloud package update fixes these issues (but this is a workaround). + phpfpm-nextcloud.restartTriggers = [ cfg.package ]; + nextcloud-setup = let c = cfg.config; writePhpArrary = a: "[${concatMapStringsSep "," (val: ''"${toString val}"'') a}]"; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index fc454f8ba254..332e4d1ff3e8 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -161,5 +161,11 @@ }; } + + + Ideally we should make sure that it's possible to jump two NixOS versions forward: + i.e. the warnings and the logic in the module should guard a user to upgrade from a + Nextcloud on e.g. 19.09 to a Nextcloud on 20.09. + From 26e9a3498b44afa5604dfe698607b59fde104d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 31 May 2020 09:22:22 +0100 Subject: [PATCH 343/624] nixos/home-assistant: make service reloadable This allows quick reloads using the following trick: $(nix-build --show-trace --no-out-link \ -E '(with import {}; pkgs.writeScript "update-hass-config" config.systemd.services.home-assistant.preStart)') systemctl reload home-assistant --- nixos/modules/services/misc/home-assistant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 8ce2437841b0..0477254e7c18 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -240,6 +240,7 @@ in { ''); serviceConfig = { ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "hass"; Group = "hass"; Restart = "on-failure"; From d690aa8ecd82c4c0dfa8f4c5a51f4f787084cdf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 20 Jun 2020 06:05:36 +0100 Subject: [PATCH 344/624] python3.pkgs.influxdb: fix build --- pkgs/development/python-modules/influxdb/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 0cc32dbc874d..650235b29401 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -5,6 +5,8 @@ , dateutil , pytz , six +, msgpack +, fetchpatch }: buildPythonPackage rec { @@ -16,9 +18,16 @@ buildPythonPackage rec { sha256 = "9bcaafd57ac152b9824ab12ed19f204206ef5df8af68404770554c5b55b475f6"; }; + patches = [ + (fetchpatch { + url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch"; + sha256 = "1fb9qrq1kp24pixjwvzhdy67z3h0wnj92aj0jw0a25fd0rdxdvg4"; + }) + ]; + # ImportError: No module named tests doCheck = false; - propagatedBuildInputs = [ requests dateutil pytz six ]; + propagatedBuildInputs = [ requests dateutil pytz six msgpack ]; meta = with stdenv.lib; { description = "Python client for InfluxDB"; From 6c1aea69c616b5c2c060c0f6a03cc0282dc17081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 31 May 2020 00:39:29 +0100 Subject: [PATCH 345/624] python3.pkgs.pyicloud: fix build --- pkgs/development/python-modules/pyicloud/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 2725aca5a826..6e808a010585 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -38,9 +38,10 @@ buildPythonPackage rec { postPatch = '' sed -i \ - -e 's!click>=6.0,<7.0!click!' \ - -e 's!keyring>=8.0,<9.0!keyring!' \ - -e 's!keyrings.alt>=1.0,<2.0!keyrings.alt!' \ + -e 's!click>=.*!click!' \ + -e 's!keyring>=.*!keyring!' \ + -e 's!keyrings.alt>=.*!keyrings.alt!' \ + -e 's!tzlocal==.*!tzlocal!' \ requirements.txt ''; From e3ef6f60ab50121386fec5a4a27150117cc3fa8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 20 Jun 2020 12:17:42 +0200 Subject: [PATCH 346/624] patchelf_0_9: bring this version back --- pkgs/development/tools/misc/patchelf/0.9.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/tools/misc/patchelf/0.9.nix diff --git a/pkgs/development/tools/misc/patchelf/0.9.nix b/pkgs/development/tools/misc/patchelf/0.9.nix new file mode 100644 index 000000000000..c64d722ca711 --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/0.9.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, patchelf }: + +stdenv.mkDerivation rec { + name = "patchelf-0.9"; + + src = fetchurl { + url = "https://nixos.org/releases/patchelf/${name}/${name}.tar.bz2"; + sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83"; + }; + + setupHook = [ ./setup-hook.sh ]; + + doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 + + inherit (patchelf) meta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca857afc5eea..565468714128 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10817,6 +10817,7 @@ in parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); From 3eea039a964ecefbc657498b3829dfa19727f069 Mon Sep 17 00:00:00 2001 From: Simon Chatterjee Date: Fri, 19 Jun 2020 15:53:46 +0100 Subject: [PATCH 347/624] python: entrance: 1.1.12 -> 1.1.13 Required by the ujson update in #89723 --- pkgs/development/python-modules/entrance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 371c9bcc9e04..eb7a9d984ffe 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -18,11 +18,11 @@ in buildPythonPackage rec { pname = "entrance"; - version = "1.1.12"; + version = "1.1.13"; src = fetchPypi { inherit pname version; - sha256 = "ef7cdf76226344f7cb92c8f81b6c03bbe944a095434f86275f178809c84108ca"; + sha256 = "1vmyfhlpcz9fip89z7bl9va3bybz4p3clifn6x3329v1ms9bm1gc"; }; # The versions of `sanic` and `websockets` in nixpkgs only support 3.6 or later From a52ec5663724a9bd37436f71a6894a7d01699804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 20 Jun 2020 12:30:58 +0200 Subject: [PATCH 348/624] mesa.drivers: build with patchelf 0.9, as a quick hack --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 565468714128..80a75d15b2bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13799,7 +13799,13 @@ in llvmPackages = llvmPackages_9; inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; - }; + } + # Temporary fix for .drivers that avoids causing lots of rebuilds; see #91145 + // { drivers = (mesa.overrideAttrs (a: { + nativeBuildInputs = [ patchelf_0_9 ] ++ a.nativeBuildInputs or []; + })).drivers; + } + ; mesa_glu = callPackage ../development/libraries/mesa-glu { inherit (darwin.apple_sdk.frameworks) ApplicationServices; From 433f227f705ebc65de059ea2f5b24ad51349d3ad Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 18 Jan 2020 12:00:00 +0000 Subject: [PATCH 349/624] nixos/sslh: make it possible (and the default) to listen on ipv6 --- nixos/modules/services/networking/sslh.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index c4fa370a5fef..0921febba668 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -15,7 +15,11 @@ let listen: ( - { host: "${cfg.listenAddress}"; port: "${toString cfg.port}"; } + ${ + concatMapStringsSep ",\n" + (addr: ''{ host: "${addr}"; port: "${toString cfg.port}"; }'') + cfg.listenAddresses + } ); ${cfg.appendConfig} @@ -33,6 +37,10 @@ let ''; in { + imports = [ + (mkRenamedOptionModule [ "services" "sslh" "listenAddress" ] [ "services" "sslh" "listenAddresses" ]) + ]; + options = { services.sslh = { enable = mkEnableOption "sslh"; @@ -55,10 +63,10 @@ in description = "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them"; }; - listenAddress = mkOption { - type = types.str; - default = "0.0.0.0"; - description = "Listening address or hostname."; + listenAddresses = mkOption { + type = types.coercedTo types.str singleton (types.listOf types.str); + default = [ "0.0.0.0" "[::]" ]; + description = "Listening addresses or hostnames."; }; port = mkOption { From b9a7e21ef61a336277b79772620784aca47d6298 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 20 Jun 2020 12:52:31 +0200 Subject: [PATCH 350/624] nixos-hardware: prepare for merge by moving to nixos/hardware MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is going to be merged into nixpkgs, under `nixos/hardware`. This will give better discoverability, and considering the low turnover (less than 100 commits in the last year and only 350 total) it won’t make any dent on the size of nixpkgs. We have a monorepo, let’s use it. --- .gitignore => nixos/hardware/.gitignore | 0 .travis.yml => nixos/hardware/.travis.yml | 0 CODEOWNERS => nixos/hardware/CODEOWNERS | 0 CONTRIBUTING.md => nixos/hardware/CONTRIBUTING.md | 0 COPYING => nixos/hardware/COPYING | 0 README.md => nixos/hardware/README.md | 0 {acer => nixos/hardware/acer}/aspire/4810t/README.wiki | 0 {acer => nixos/hardware/acer}/aspire/4810t/default.nix | 0 {airis => nixos/hardware/airis}/n990/default.nix | 0 {apple => nixos/hardware/apple}/default.nix | 0 {apple => nixos/hardware/apple}/macbook-air/3/default.nix | 0 {apple => nixos/hardware/apple}/macbook-air/4/default.nix | 0 {apple => nixos/hardware/apple}/macbook-air/6/default.nix | 0 {apple => nixos/hardware/apple}/macbook-air/default.nix | 0 {apple => nixos/hardware/apple}/macbook-pro/10-1/README.wiki | 0 {apple => nixos/hardware/apple}/macbook-pro/10-1/default.nix | 0 {apple => nixos/hardware/apple}/macbook-pro/11-5/README.md | 0 {apple => nixos/hardware/apple}/macbook-pro/11-5/default.nix | 0 {apple => nixos/hardware/apple}/macbook-pro/12-1/default.nix | 0 {apple => nixos/hardware/apple}/macbook-pro/default.nix | 0 {asus => nixos/hardware/asus}/wireless-ac1300.nix | 0 {audio-gd => nixos/hardware/audio-gd}/compass2.nix | 0 .../hardware/beagleboard}/pocketbeagle/default.nix | 0 {common => nixos/hardware/common}/cpu/amd/default.nix | 0 {common => nixos/hardware/common}/cpu/intel/default.nix | 0 {common => nixos/hardware/common}/cpu/intel/kaby-lake/default.nix | 0 .../hardware/common}/cpu/intel/sandy-bridge/default.nix | 0 {common => nixos/hardware/common}/pc/default.nix | 0 {common => nixos/hardware/common}/pc/hdd/default.nix | 0 {common => nixos/hardware/common}/pc/laptop/acpi_call.nix | 0 {common => nixos/hardware/common}/pc/laptop/default.nix | 0 {common => nixos/hardware/common}/pc/laptop/hdd/default.nix | 0 {common => nixos/hardware/common}/pc/laptop/ssd | 0 {common => nixos/hardware/common}/pc/ssd/default.nix | 0 default.nix => nixos/hardware/default.nix | 0 {dell => nixos/hardware/dell}/e7240/README.md | 0 {dell => nixos/hardware/dell}/e7240/default.nix | 0 {dell => nixos/hardware/dell}/latitude/3480/default.nix | 0 {dell => nixos/hardware/dell}/xps/13-7390/README.wiki | 0 {dell => nixos/hardware/dell}/xps/13-7390/default.nix | 0 {dell => nixos/hardware/dell}/xps/13-9360/default.nix | 0 {dell => nixos/hardware/dell}/xps/13-9360/qca6174-firmware.nix | 0 {dell => nixos/hardware/dell}/xps/13-9370/README.wiki | 0 {dell => nixos/hardware/dell}/xps/13-9370/default.nix | 0 {dell => nixos/hardware/dell}/xps/13-9380/README.wiki | 0 {dell => nixos/hardware/dell}/xps/13-9380/default.nix | 0 {dell => nixos/hardware/dell}/xps/15-7590/README.wiki | 0 {dell => nixos/hardware/dell}/xps/15-7590/default.nix | 0 {dell => nixos/hardware/dell}/xps/15-9550/README.wiki | 0 {dell => nixos/hardware/dell}/xps/15-9550/default.nix | 0 {dell => nixos/hardware/dell}/xps/15-9560/README.wiki | 0 {dell => nixos/hardware/dell}/xps/15-9560/default.nix | 0 {dell => nixos/hardware/dell}/xps/15-9560/intel/default.nix | 0 {dell => nixos/hardware/dell}/xps/15-9560/nvidia/default.nix | 0 {dell => nixos/hardware/dell}/xps/15-9560/xps-common.nix | 0 {google => nixos/hardware/google}/pixelbook/default.nix | 0 {inversepath => nixos/hardware/inversepath}/usbarmory/README.txt | 0 {inversepath => nixos/hardware/inversepath}/usbarmory/default.nix | 0 {inversepath => nixos/hardware/inversepath}/usbarmory/host.nix | 0 .../hardware/inversepath}/usbarmory/kernel.config | 0 {inversepath => nixos/hardware/inversepath}/usbarmory/kernel.nix | 0 .../hardware/inversepath}/usbarmory/usbarmory-dts.patch | 0 {lenovo => nixos/hardware/lenovo}/ideapad/default.nix | 0 {lenovo => nixos/hardware/lenovo}/ideapad/z510/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/e495/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/l13/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/p53/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t410/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t420/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t430/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t440p/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t440s/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t450s/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t460s/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t470s/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t480s/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t490/default.nix | 0 .../hardware/lenovo}/thinkpad/t490/t490-profile-set.conf | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/t495/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/tp-smapi.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x1-extreme/default.nix | 0 .../hardware/lenovo}/thinkpad/x1-extreme/gen2/default.nix | 0 .../hardware/lenovo}/thinkpad/x1/6th-gen/QHD/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x1/6th-gen/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x1/7th-gen/audio.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x1/7th-gen/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x1/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x140e/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x220/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x230/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x250/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x260/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x270/default.nix | 0 {lenovo => nixos/hardware/lenovo}/thinkpad/x280/default.nix | 0 {microsoft => nixos/hardware/microsoft}/hyper-v/README.md | 0 {microsoft => nixos/hardware/microsoft}/surface-pro/3/README.wiki | 0 {microsoft => nixos/hardware/microsoft}/surface-pro/3/default.nix | 0 {pcengines => nixos/hardware/pcengines}/apu/default.nix | 0 {purism => nixos/hardware/purism}/librem/13v3/README.md | 0 {purism => nixos/hardware/purism}/librem/13v3/default.nix | 0 {purism => nixos/hardware/purism}/librem/15v3 | 0 {raspberry-pi => nixos/hardware/raspberry-pi}/2/README.org | 0 {raspberry-pi => nixos/hardware/raspberry-pi}/2/default.nix | 0 {samsung => nixos/hardware/samsung}/np900x3c/README.wiki | 0 {samsung => nixos/hardware/samsung}/np900x3c/default.nix | 0 {supermicro => nixos/hardware/supermicro}/a1sri-2758f/default.nix | 0 {supermicro => nixos/hardware/supermicro}/x10sll-f/default.nix | 0 {tests => nixos/hardware/tests}/build-profile.nix | 0 {tests => nixos/hardware/tests}/run.py | 0 {toshiba => nixos/hardware/toshiba}/swanky/README.md | 0 {toshiba => nixos/hardware/toshiba}/swanky/default.nix | 0 {tuxedo => nixos/hardware/tuxedo}/infinitybook/v4/default.nix | 0 113 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => nixos/hardware/.gitignore (100%) rename .travis.yml => nixos/hardware/.travis.yml (100%) rename CODEOWNERS => nixos/hardware/CODEOWNERS (100%) rename CONTRIBUTING.md => nixos/hardware/CONTRIBUTING.md (100%) rename COPYING => nixos/hardware/COPYING (100%) rename README.md => nixos/hardware/README.md (100%) rename {acer => nixos/hardware/acer}/aspire/4810t/README.wiki (100%) rename {acer => nixos/hardware/acer}/aspire/4810t/default.nix (100%) rename {airis => nixos/hardware/airis}/n990/default.nix (100%) rename {apple => nixos/hardware/apple}/default.nix (100%) rename {apple => nixos/hardware/apple}/macbook-air/3/default.nix (100%) rename {apple => nixos/hardware/apple}/macbook-air/4/default.nix (100%) rename {apple => nixos/hardware/apple}/macbook-air/6/default.nix (100%) rename {apple => nixos/hardware/apple}/macbook-air/default.nix (100%) rename {apple => nixos/hardware/apple}/macbook-pro/10-1/README.wiki (100%) rename {apple => nixos/hardware/apple}/macbook-pro/10-1/default.nix (100%) rename {apple => nixos/hardware/apple}/macbook-pro/11-5/README.md (100%) rename {apple => nixos/hardware/apple}/macbook-pro/11-5/default.nix (100%) rename {apple => nixos/hardware/apple}/macbook-pro/12-1/default.nix (100%) rename {apple => nixos/hardware/apple}/macbook-pro/default.nix (100%) rename {asus => nixos/hardware/asus}/wireless-ac1300.nix (100%) rename {audio-gd => nixos/hardware/audio-gd}/compass2.nix (100%) rename {beagleboard => nixos/hardware/beagleboard}/pocketbeagle/default.nix (100%) rename {common => nixos/hardware/common}/cpu/amd/default.nix (100%) rename {common => nixos/hardware/common}/cpu/intel/default.nix (100%) rename {common => nixos/hardware/common}/cpu/intel/kaby-lake/default.nix (100%) rename {common => nixos/hardware/common}/cpu/intel/sandy-bridge/default.nix (100%) rename {common => nixos/hardware/common}/pc/default.nix (100%) rename {common => nixos/hardware/common}/pc/hdd/default.nix (100%) rename {common => nixos/hardware/common}/pc/laptop/acpi_call.nix (100%) rename {common => nixos/hardware/common}/pc/laptop/default.nix (100%) rename {common => nixos/hardware/common}/pc/laptop/hdd/default.nix (100%) rename {common => nixos/hardware/common}/pc/laptop/ssd (100%) rename {common => nixos/hardware/common}/pc/ssd/default.nix (100%) rename default.nix => nixos/hardware/default.nix (100%) rename {dell => nixos/hardware/dell}/e7240/README.md (100%) rename {dell => nixos/hardware/dell}/e7240/default.nix (100%) rename {dell => nixos/hardware/dell}/latitude/3480/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/13-7390/README.wiki (100%) rename {dell => nixos/hardware/dell}/xps/13-7390/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/13-9360/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/13-9360/qca6174-firmware.nix (100%) rename {dell => nixos/hardware/dell}/xps/13-9370/README.wiki (100%) rename {dell => nixos/hardware/dell}/xps/13-9370/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/13-9380/README.wiki (100%) rename {dell => nixos/hardware/dell}/xps/13-9380/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/15-7590/README.wiki (100%) rename {dell => nixos/hardware/dell}/xps/15-7590/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/15-9550/README.wiki (100%) rename {dell => nixos/hardware/dell}/xps/15-9550/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/15-9560/README.wiki (100%) rename {dell => nixos/hardware/dell}/xps/15-9560/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/15-9560/intel/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/15-9560/nvidia/default.nix (100%) rename {dell => nixos/hardware/dell}/xps/15-9560/xps-common.nix (100%) rename {google => nixos/hardware/google}/pixelbook/default.nix (100%) rename {inversepath => nixos/hardware/inversepath}/usbarmory/README.txt (100%) rename {inversepath => nixos/hardware/inversepath}/usbarmory/default.nix (100%) rename {inversepath => nixos/hardware/inversepath}/usbarmory/host.nix (100%) rename {inversepath => nixos/hardware/inversepath}/usbarmory/kernel.config (100%) rename {inversepath => nixos/hardware/inversepath}/usbarmory/kernel.nix (100%) rename {inversepath => nixos/hardware/inversepath}/usbarmory/usbarmory-dts.patch (100%) rename {lenovo => nixos/hardware/lenovo}/ideapad/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/ideapad/z510/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/e495/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/l13/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/p53/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t410/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t420/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t430/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t440p/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t440s/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t450s/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t460s/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t470s/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t480s/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t490/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t490/t490-profile-set.conf (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/t495/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/tp-smapi.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x1-extreme/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x1-extreme/gen2/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x1/6th-gen/QHD/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x1/6th-gen/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x1/7th-gen/audio.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x1/7th-gen/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x1/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x140e/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x220/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x230/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x250/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x260/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x270/default.nix (100%) rename {lenovo => nixos/hardware/lenovo}/thinkpad/x280/default.nix (100%) rename {microsoft => nixos/hardware/microsoft}/hyper-v/README.md (100%) rename {microsoft => nixos/hardware/microsoft}/surface-pro/3/README.wiki (100%) rename {microsoft => nixos/hardware/microsoft}/surface-pro/3/default.nix (100%) rename {pcengines => nixos/hardware/pcengines}/apu/default.nix (100%) rename {purism => nixos/hardware/purism}/librem/13v3/README.md (100%) rename {purism => nixos/hardware/purism}/librem/13v3/default.nix (100%) rename {purism => nixos/hardware/purism}/librem/15v3 (100%) rename {raspberry-pi => nixos/hardware/raspberry-pi}/2/README.org (100%) rename {raspberry-pi => nixos/hardware/raspberry-pi}/2/default.nix (100%) rename {samsung => nixos/hardware/samsung}/np900x3c/README.wiki (100%) rename {samsung => nixos/hardware/samsung}/np900x3c/default.nix (100%) rename {supermicro => nixos/hardware/supermicro}/a1sri-2758f/default.nix (100%) rename {supermicro => nixos/hardware/supermicro}/x10sll-f/default.nix (100%) rename {tests => nixos/hardware/tests}/build-profile.nix (100%) rename {tests => nixos/hardware/tests}/run.py (100%) rename {toshiba => nixos/hardware/toshiba}/swanky/README.md (100%) rename {toshiba => nixos/hardware/toshiba}/swanky/default.nix (100%) rename {tuxedo => nixos/hardware/tuxedo}/infinitybook/v4/default.nix (100%) diff --git a/.gitignore b/nixos/hardware/.gitignore similarity index 100% rename from .gitignore rename to nixos/hardware/.gitignore diff --git a/.travis.yml b/nixos/hardware/.travis.yml similarity index 100% rename from .travis.yml rename to nixos/hardware/.travis.yml diff --git a/CODEOWNERS b/nixos/hardware/CODEOWNERS similarity index 100% rename from CODEOWNERS rename to nixos/hardware/CODEOWNERS diff --git a/CONTRIBUTING.md b/nixos/hardware/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to nixos/hardware/CONTRIBUTING.md diff --git a/COPYING b/nixos/hardware/COPYING similarity index 100% rename from COPYING rename to nixos/hardware/COPYING diff --git a/README.md b/nixos/hardware/README.md similarity index 100% rename from README.md rename to nixos/hardware/README.md diff --git a/acer/aspire/4810t/README.wiki b/nixos/hardware/acer/aspire/4810t/README.wiki similarity index 100% rename from acer/aspire/4810t/README.wiki rename to nixos/hardware/acer/aspire/4810t/README.wiki diff --git a/acer/aspire/4810t/default.nix b/nixos/hardware/acer/aspire/4810t/default.nix similarity index 100% rename from acer/aspire/4810t/default.nix rename to nixos/hardware/acer/aspire/4810t/default.nix diff --git a/airis/n990/default.nix b/nixos/hardware/airis/n990/default.nix similarity index 100% rename from airis/n990/default.nix rename to nixos/hardware/airis/n990/default.nix diff --git a/apple/default.nix b/nixos/hardware/apple/default.nix similarity index 100% rename from apple/default.nix rename to nixos/hardware/apple/default.nix diff --git a/apple/macbook-air/3/default.nix b/nixos/hardware/apple/macbook-air/3/default.nix similarity index 100% rename from apple/macbook-air/3/default.nix rename to nixos/hardware/apple/macbook-air/3/default.nix diff --git a/apple/macbook-air/4/default.nix b/nixos/hardware/apple/macbook-air/4/default.nix similarity index 100% rename from apple/macbook-air/4/default.nix rename to nixos/hardware/apple/macbook-air/4/default.nix diff --git a/apple/macbook-air/6/default.nix b/nixos/hardware/apple/macbook-air/6/default.nix similarity index 100% rename from apple/macbook-air/6/default.nix rename to nixos/hardware/apple/macbook-air/6/default.nix diff --git a/apple/macbook-air/default.nix b/nixos/hardware/apple/macbook-air/default.nix similarity index 100% rename from apple/macbook-air/default.nix rename to nixos/hardware/apple/macbook-air/default.nix diff --git a/apple/macbook-pro/10-1/README.wiki b/nixos/hardware/apple/macbook-pro/10-1/README.wiki similarity index 100% rename from apple/macbook-pro/10-1/README.wiki rename to nixos/hardware/apple/macbook-pro/10-1/README.wiki diff --git a/apple/macbook-pro/10-1/default.nix b/nixos/hardware/apple/macbook-pro/10-1/default.nix similarity index 100% rename from apple/macbook-pro/10-1/default.nix rename to nixos/hardware/apple/macbook-pro/10-1/default.nix diff --git a/apple/macbook-pro/11-5/README.md b/nixos/hardware/apple/macbook-pro/11-5/README.md similarity index 100% rename from apple/macbook-pro/11-5/README.md rename to nixos/hardware/apple/macbook-pro/11-5/README.md diff --git a/apple/macbook-pro/11-5/default.nix b/nixos/hardware/apple/macbook-pro/11-5/default.nix similarity index 100% rename from apple/macbook-pro/11-5/default.nix rename to nixos/hardware/apple/macbook-pro/11-5/default.nix diff --git a/apple/macbook-pro/12-1/default.nix b/nixos/hardware/apple/macbook-pro/12-1/default.nix similarity index 100% rename from apple/macbook-pro/12-1/default.nix rename to nixos/hardware/apple/macbook-pro/12-1/default.nix diff --git a/apple/macbook-pro/default.nix b/nixos/hardware/apple/macbook-pro/default.nix similarity index 100% rename from apple/macbook-pro/default.nix rename to nixos/hardware/apple/macbook-pro/default.nix diff --git a/asus/wireless-ac1300.nix b/nixos/hardware/asus/wireless-ac1300.nix similarity index 100% rename from asus/wireless-ac1300.nix rename to nixos/hardware/asus/wireless-ac1300.nix diff --git a/audio-gd/compass2.nix b/nixos/hardware/audio-gd/compass2.nix similarity index 100% rename from audio-gd/compass2.nix rename to nixos/hardware/audio-gd/compass2.nix diff --git a/beagleboard/pocketbeagle/default.nix b/nixos/hardware/beagleboard/pocketbeagle/default.nix similarity index 100% rename from beagleboard/pocketbeagle/default.nix rename to nixos/hardware/beagleboard/pocketbeagle/default.nix diff --git a/common/cpu/amd/default.nix b/nixos/hardware/common/cpu/amd/default.nix similarity index 100% rename from common/cpu/amd/default.nix rename to nixos/hardware/common/cpu/amd/default.nix diff --git a/common/cpu/intel/default.nix b/nixos/hardware/common/cpu/intel/default.nix similarity index 100% rename from common/cpu/intel/default.nix rename to nixos/hardware/common/cpu/intel/default.nix diff --git a/common/cpu/intel/kaby-lake/default.nix b/nixos/hardware/common/cpu/intel/kaby-lake/default.nix similarity index 100% rename from common/cpu/intel/kaby-lake/default.nix rename to nixos/hardware/common/cpu/intel/kaby-lake/default.nix diff --git a/common/cpu/intel/sandy-bridge/default.nix b/nixos/hardware/common/cpu/intel/sandy-bridge/default.nix similarity index 100% rename from common/cpu/intel/sandy-bridge/default.nix rename to nixos/hardware/common/cpu/intel/sandy-bridge/default.nix diff --git a/common/pc/default.nix b/nixos/hardware/common/pc/default.nix similarity index 100% rename from common/pc/default.nix rename to nixos/hardware/common/pc/default.nix diff --git a/common/pc/hdd/default.nix b/nixos/hardware/common/pc/hdd/default.nix similarity index 100% rename from common/pc/hdd/default.nix rename to nixos/hardware/common/pc/hdd/default.nix diff --git a/common/pc/laptop/acpi_call.nix b/nixos/hardware/common/pc/laptop/acpi_call.nix similarity index 100% rename from common/pc/laptop/acpi_call.nix rename to nixos/hardware/common/pc/laptop/acpi_call.nix diff --git a/common/pc/laptop/default.nix b/nixos/hardware/common/pc/laptop/default.nix similarity index 100% rename from common/pc/laptop/default.nix rename to nixos/hardware/common/pc/laptop/default.nix diff --git a/common/pc/laptop/hdd/default.nix b/nixos/hardware/common/pc/laptop/hdd/default.nix similarity index 100% rename from common/pc/laptop/hdd/default.nix rename to nixos/hardware/common/pc/laptop/hdd/default.nix diff --git a/common/pc/laptop/ssd b/nixos/hardware/common/pc/laptop/ssd similarity index 100% rename from common/pc/laptop/ssd rename to nixos/hardware/common/pc/laptop/ssd diff --git a/common/pc/ssd/default.nix b/nixos/hardware/common/pc/ssd/default.nix similarity index 100% rename from common/pc/ssd/default.nix rename to nixos/hardware/common/pc/ssd/default.nix diff --git a/default.nix b/nixos/hardware/default.nix similarity index 100% rename from default.nix rename to nixos/hardware/default.nix diff --git a/dell/e7240/README.md b/nixos/hardware/dell/e7240/README.md similarity index 100% rename from dell/e7240/README.md rename to nixos/hardware/dell/e7240/README.md diff --git a/dell/e7240/default.nix b/nixos/hardware/dell/e7240/default.nix similarity index 100% rename from dell/e7240/default.nix rename to nixos/hardware/dell/e7240/default.nix diff --git a/dell/latitude/3480/default.nix b/nixos/hardware/dell/latitude/3480/default.nix similarity index 100% rename from dell/latitude/3480/default.nix rename to nixos/hardware/dell/latitude/3480/default.nix diff --git a/dell/xps/13-7390/README.wiki b/nixos/hardware/dell/xps/13-7390/README.wiki similarity index 100% rename from dell/xps/13-7390/README.wiki rename to nixos/hardware/dell/xps/13-7390/README.wiki diff --git a/dell/xps/13-7390/default.nix b/nixos/hardware/dell/xps/13-7390/default.nix similarity index 100% rename from dell/xps/13-7390/default.nix rename to nixos/hardware/dell/xps/13-7390/default.nix diff --git a/dell/xps/13-9360/default.nix b/nixos/hardware/dell/xps/13-9360/default.nix similarity index 100% rename from dell/xps/13-9360/default.nix rename to nixos/hardware/dell/xps/13-9360/default.nix diff --git a/dell/xps/13-9360/qca6174-firmware.nix b/nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix similarity index 100% rename from dell/xps/13-9360/qca6174-firmware.nix rename to nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix diff --git a/dell/xps/13-9370/README.wiki b/nixos/hardware/dell/xps/13-9370/README.wiki similarity index 100% rename from dell/xps/13-9370/README.wiki rename to nixos/hardware/dell/xps/13-9370/README.wiki diff --git a/dell/xps/13-9370/default.nix b/nixos/hardware/dell/xps/13-9370/default.nix similarity index 100% rename from dell/xps/13-9370/default.nix rename to nixos/hardware/dell/xps/13-9370/default.nix diff --git a/dell/xps/13-9380/README.wiki b/nixos/hardware/dell/xps/13-9380/README.wiki similarity index 100% rename from dell/xps/13-9380/README.wiki rename to nixos/hardware/dell/xps/13-9380/README.wiki diff --git a/dell/xps/13-9380/default.nix b/nixos/hardware/dell/xps/13-9380/default.nix similarity index 100% rename from dell/xps/13-9380/default.nix rename to nixos/hardware/dell/xps/13-9380/default.nix diff --git a/dell/xps/15-7590/README.wiki b/nixos/hardware/dell/xps/15-7590/README.wiki similarity index 100% rename from dell/xps/15-7590/README.wiki rename to nixos/hardware/dell/xps/15-7590/README.wiki diff --git a/dell/xps/15-7590/default.nix b/nixos/hardware/dell/xps/15-7590/default.nix similarity index 100% rename from dell/xps/15-7590/default.nix rename to nixos/hardware/dell/xps/15-7590/default.nix diff --git a/dell/xps/15-9550/README.wiki b/nixos/hardware/dell/xps/15-9550/README.wiki similarity index 100% rename from dell/xps/15-9550/README.wiki rename to nixos/hardware/dell/xps/15-9550/README.wiki diff --git a/dell/xps/15-9550/default.nix b/nixos/hardware/dell/xps/15-9550/default.nix similarity index 100% rename from dell/xps/15-9550/default.nix rename to nixos/hardware/dell/xps/15-9550/default.nix diff --git a/dell/xps/15-9560/README.wiki b/nixos/hardware/dell/xps/15-9560/README.wiki similarity index 100% rename from dell/xps/15-9560/README.wiki rename to nixos/hardware/dell/xps/15-9560/README.wiki diff --git a/dell/xps/15-9560/default.nix b/nixos/hardware/dell/xps/15-9560/default.nix similarity index 100% rename from dell/xps/15-9560/default.nix rename to nixos/hardware/dell/xps/15-9560/default.nix diff --git a/dell/xps/15-9560/intel/default.nix b/nixos/hardware/dell/xps/15-9560/intel/default.nix similarity index 100% rename from dell/xps/15-9560/intel/default.nix rename to nixos/hardware/dell/xps/15-9560/intel/default.nix diff --git a/dell/xps/15-9560/nvidia/default.nix b/nixos/hardware/dell/xps/15-9560/nvidia/default.nix similarity index 100% rename from dell/xps/15-9560/nvidia/default.nix rename to nixos/hardware/dell/xps/15-9560/nvidia/default.nix diff --git a/dell/xps/15-9560/xps-common.nix b/nixos/hardware/dell/xps/15-9560/xps-common.nix similarity index 100% rename from dell/xps/15-9560/xps-common.nix rename to nixos/hardware/dell/xps/15-9560/xps-common.nix diff --git a/google/pixelbook/default.nix b/nixos/hardware/google/pixelbook/default.nix similarity index 100% rename from google/pixelbook/default.nix rename to nixos/hardware/google/pixelbook/default.nix diff --git a/inversepath/usbarmory/README.txt b/nixos/hardware/inversepath/usbarmory/README.txt similarity index 100% rename from inversepath/usbarmory/README.txt rename to nixos/hardware/inversepath/usbarmory/README.txt diff --git a/inversepath/usbarmory/default.nix b/nixos/hardware/inversepath/usbarmory/default.nix similarity index 100% rename from inversepath/usbarmory/default.nix rename to nixos/hardware/inversepath/usbarmory/default.nix diff --git a/inversepath/usbarmory/host.nix b/nixos/hardware/inversepath/usbarmory/host.nix similarity index 100% rename from inversepath/usbarmory/host.nix rename to nixos/hardware/inversepath/usbarmory/host.nix diff --git a/inversepath/usbarmory/kernel.config b/nixos/hardware/inversepath/usbarmory/kernel.config similarity index 100% rename from inversepath/usbarmory/kernel.config rename to nixos/hardware/inversepath/usbarmory/kernel.config diff --git a/inversepath/usbarmory/kernel.nix b/nixos/hardware/inversepath/usbarmory/kernel.nix similarity index 100% rename from inversepath/usbarmory/kernel.nix rename to nixos/hardware/inversepath/usbarmory/kernel.nix diff --git a/inversepath/usbarmory/usbarmory-dts.patch b/nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch similarity index 100% rename from inversepath/usbarmory/usbarmory-dts.patch rename to nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch diff --git a/lenovo/ideapad/default.nix b/nixos/hardware/lenovo/ideapad/default.nix similarity index 100% rename from lenovo/ideapad/default.nix rename to nixos/hardware/lenovo/ideapad/default.nix diff --git a/lenovo/ideapad/z510/default.nix b/nixos/hardware/lenovo/ideapad/z510/default.nix similarity index 100% rename from lenovo/ideapad/z510/default.nix rename to nixos/hardware/lenovo/ideapad/z510/default.nix diff --git a/lenovo/thinkpad/default.nix b/nixos/hardware/lenovo/thinkpad/default.nix similarity index 100% rename from lenovo/thinkpad/default.nix rename to nixos/hardware/lenovo/thinkpad/default.nix diff --git a/lenovo/thinkpad/e495/default.nix b/nixos/hardware/lenovo/thinkpad/e495/default.nix similarity index 100% rename from lenovo/thinkpad/e495/default.nix rename to nixos/hardware/lenovo/thinkpad/e495/default.nix diff --git a/lenovo/thinkpad/l13/default.nix b/nixos/hardware/lenovo/thinkpad/l13/default.nix similarity index 100% rename from lenovo/thinkpad/l13/default.nix rename to nixos/hardware/lenovo/thinkpad/l13/default.nix diff --git a/lenovo/thinkpad/p53/default.nix b/nixos/hardware/lenovo/thinkpad/p53/default.nix similarity index 100% rename from lenovo/thinkpad/p53/default.nix rename to nixos/hardware/lenovo/thinkpad/p53/default.nix diff --git a/lenovo/thinkpad/t410/default.nix b/nixos/hardware/lenovo/thinkpad/t410/default.nix similarity index 100% rename from lenovo/thinkpad/t410/default.nix rename to nixos/hardware/lenovo/thinkpad/t410/default.nix diff --git a/lenovo/thinkpad/t420/default.nix b/nixos/hardware/lenovo/thinkpad/t420/default.nix similarity index 100% rename from lenovo/thinkpad/t420/default.nix rename to nixos/hardware/lenovo/thinkpad/t420/default.nix diff --git a/lenovo/thinkpad/t430/default.nix b/nixos/hardware/lenovo/thinkpad/t430/default.nix similarity index 100% rename from lenovo/thinkpad/t430/default.nix rename to nixos/hardware/lenovo/thinkpad/t430/default.nix diff --git a/lenovo/thinkpad/t440p/default.nix b/nixos/hardware/lenovo/thinkpad/t440p/default.nix similarity index 100% rename from lenovo/thinkpad/t440p/default.nix rename to nixos/hardware/lenovo/thinkpad/t440p/default.nix diff --git a/lenovo/thinkpad/t440s/default.nix b/nixos/hardware/lenovo/thinkpad/t440s/default.nix similarity index 100% rename from lenovo/thinkpad/t440s/default.nix rename to nixos/hardware/lenovo/thinkpad/t440s/default.nix diff --git a/lenovo/thinkpad/t450s/default.nix b/nixos/hardware/lenovo/thinkpad/t450s/default.nix similarity index 100% rename from lenovo/thinkpad/t450s/default.nix rename to nixos/hardware/lenovo/thinkpad/t450s/default.nix diff --git a/lenovo/thinkpad/t460s/default.nix b/nixos/hardware/lenovo/thinkpad/t460s/default.nix similarity index 100% rename from lenovo/thinkpad/t460s/default.nix rename to nixos/hardware/lenovo/thinkpad/t460s/default.nix diff --git a/lenovo/thinkpad/t470s/default.nix b/nixos/hardware/lenovo/thinkpad/t470s/default.nix similarity index 100% rename from lenovo/thinkpad/t470s/default.nix rename to nixos/hardware/lenovo/thinkpad/t470s/default.nix diff --git a/lenovo/thinkpad/t480s/default.nix b/nixos/hardware/lenovo/thinkpad/t480s/default.nix similarity index 100% rename from lenovo/thinkpad/t480s/default.nix rename to nixos/hardware/lenovo/thinkpad/t480s/default.nix diff --git a/lenovo/thinkpad/t490/default.nix b/nixos/hardware/lenovo/thinkpad/t490/default.nix similarity index 100% rename from lenovo/thinkpad/t490/default.nix rename to nixos/hardware/lenovo/thinkpad/t490/default.nix diff --git a/lenovo/thinkpad/t490/t490-profile-set.conf b/nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf similarity index 100% rename from lenovo/thinkpad/t490/t490-profile-set.conf rename to nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf diff --git a/lenovo/thinkpad/t495/default.nix b/nixos/hardware/lenovo/thinkpad/t495/default.nix similarity index 100% rename from lenovo/thinkpad/t495/default.nix rename to nixos/hardware/lenovo/thinkpad/t495/default.nix diff --git a/lenovo/thinkpad/tp-smapi.nix b/nixos/hardware/lenovo/thinkpad/tp-smapi.nix similarity index 100% rename from lenovo/thinkpad/tp-smapi.nix rename to nixos/hardware/lenovo/thinkpad/tp-smapi.nix diff --git a/lenovo/thinkpad/x1-extreme/default.nix b/nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix similarity index 100% rename from lenovo/thinkpad/x1-extreme/default.nix rename to nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix diff --git a/lenovo/thinkpad/x1-extreme/gen2/default.nix b/nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix similarity index 100% rename from lenovo/thinkpad/x1-extreme/gen2/default.nix rename to nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix diff --git a/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix similarity index 100% rename from lenovo/thinkpad/x1/6th-gen/QHD/default.nix rename to nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix similarity index 100% rename from lenovo/thinkpad/x1/6th-gen/default.nix rename to nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix diff --git a/lenovo/thinkpad/x1/7th-gen/audio.nix b/nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix similarity index 100% rename from lenovo/thinkpad/x1/7th-gen/audio.nix rename to nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix diff --git a/lenovo/thinkpad/x1/7th-gen/default.nix b/nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix similarity index 100% rename from lenovo/thinkpad/x1/7th-gen/default.nix rename to nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix diff --git a/lenovo/thinkpad/x1/default.nix b/nixos/hardware/lenovo/thinkpad/x1/default.nix similarity index 100% rename from lenovo/thinkpad/x1/default.nix rename to nixos/hardware/lenovo/thinkpad/x1/default.nix diff --git a/lenovo/thinkpad/x140e/default.nix b/nixos/hardware/lenovo/thinkpad/x140e/default.nix similarity index 100% rename from lenovo/thinkpad/x140e/default.nix rename to nixos/hardware/lenovo/thinkpad/x140e/default.nix diff --git a/lenovo/thinkpad/x220/default.nix b/nixos/hardware/lenovo/thinkpad/x220/default.nix similarity index 100% rename from lenovo/thinkpad/x220/default.nix rename to nixos/hardware/lenovo/thinkpad/x220/default.nix diff --git a/lenovo/thinkpad/x230/default.nix b/nixos/hardware/lenovo/thinkpad/x230/default.nix similarity index 100% rename from lenovo/thinkpad/x230/default.nix rename to nixos/hardware/lenovo/thinkpad/x230/default.nix diff --git a/lenovo/thinkpad/x250/default.nix b/nixos/hardware/lenovo/thinkpad/x250/default.nix similarity index 100% rename from lenovo/thinkpad/x250/default.nix rename to nixos/hardware/lenovo/thinkpad/x250/default.nix diff --git a/lenovo/thinkpad/x260/default.nix b/nixos/hardware/lenovo/thinkpad/x260/default.nix similarity index 100% rename from lenovo/thinkpad/x260/default.nix rename to nixos/hardware/lenovo/thinkpad/x260/default.nix diff --git a/lenovo/thinkpad/x270/default.nix b/nixos/hardware/lenovo/thinkpad/x270/default.nix similarity index 100% rename from lenovo/thinkpad/x270/default.nix rename to nixos/hardware/lenovo/thinkpad/x270/default.nix diff --git a/lenovo/thinkpad/x280/default.nix b/nixos/hardware/lenovo/thinkpad/x280/default.nix similarity index 100% rename from lenovo/thinkpad/x280/default.nix rename to nixos/hardware/lenovo/thinkpad/x280/default.nix diff --git a/microsoft/hyper-v/README.md b/nixos/hardware/microsoft/hyper-v/README.md similarity index 100% rename from microsoft/hyper-v/README.md rename to nixos/hardware/microsoft/hyper-v/README.md diff --git a/microsoft/surface-pro/3/README.wiki b/nixos/hardware/microsoft/surface-pro/3/README.wiki similarity index 100% rename from microsoft/surface-pro/3/README.wiki rename to nixos/hardware/microsoft/surface-pro/3/README.wiki diff --git a/microsoft/surface-pro/3/default.nix b/nixos/hardware/microsoft/surface-pro/3/default.nix similarity index 100% rename from microsoft/surface-pro/3/default.nix rename to nixos/hardware/microsoft/surface-pro/3/default.nix diff --git a/pcengines/apu/default.nix b/nixos/hardware/pcengines/apu/default.nix similarity index 100% rename from pcengines/apu/default.nix rename to nixos/hardware/pcengines/apu/default.nix diff --git a/purism/librem/13v3/README.md b/nixos/hardware/purism/librem/13v3/README.md similarity index 100% rename from purism/librem/13v3/README.md rename to nixos/hardware/purism/librem/13v3/README.md diff --git a/purism/librem/13v3/default.nix b/nixos/hardware/purism/librem/13v3/default.nix similarity index 100% rename from purism/librem/13v3/default.nix rename to nixos/hardware/purism/librem/13v3/default.nix diff --git a/purism/librem/15v3 b/nixos/hardware/purism/librem/15v3 similarity index 100% rename from purism/librem/15v3 rename to nixos/hardware/purism/librem/15v3 diff --git a/raspberry-pi/2/README.org b/nixos/hardware/raspberry-pi/2/README.org similarity index 100% rename from raspberry-pi/2/README.org rename to nixos/hardware/raspberry-pi/2/README.org diff --git a/raspberry-pi/2/default.nix b/nixos/hardware/raspberry-pi/2/default.nix similarity index 100% rename from raspberry-pi/2/default.nix rename to nixos/hardware/raspberry-pi/2/default.nix diff --git a/samsung/np900x3c/README.wiki b/nixos/hardware/samsung/np900x3c/README.wiki similarity index 100% rename from samsung/np900x3c/README.wiki rename to nixos/hardware/samsung/np900x3c/README.wiki diff --git a/samsung/np900x3c/default.nix b/nixos/hardware/samsung/np900x3c/default.nix similarity index 100% rename from samsung/np900x3c/default.nix rename to nixos/hardware/samsung/np900x3c/default.nix diff --git a/supermicro/a1sri-2758f/default.nix b/nixos/hardware/supermicro/a1sri-2758f/default.nix similarity index 100% rename from supermicro/a1sri-2758f/default.nix rename to nixos/hardware/supermicro/a1sri-2758f/default.nix diff --git a/supermicro/x10sll-f/default.nix b/nixos/hardware/supermicro/x10sll-f/default.nix similarity index 100% rename from supermicro/x10sll-f/default.nix rename to nixos/hardware/supermicro/x10sll-f/default.nix diff --git a/tests/build-profile.nix b/nixos/hardware/tests/build-profile.nix similarity index 100% rename from tests/build-profile.nix rename to nixos/hardware/tests/build-profile.nix diff --git a/tests/run.py b/nixos/hardware/tests/run.py similarity index 100% rename from tests/run.py rename to nixos/hardware/tests/run.py diff --git a/toshiba/swanky/README.md b/nixos/hardware/toshiba/swanky/README.md similarity index 100% rename from toshiba/swanky/README.md rename to nixos/hardware/toshiba/swanky/README.md diff --git a/toshiba/swanky/default.nix b/nixos/hardware/toshiba/swanky/default.nix similarity index 100% rename from toshiba/swanky/default.nix rename to nixos/hardware/toshiba/swanky/default.nix diff --git a/tuxedo/infinitybook/v4/default.nix b/nixos/hardware/tuxedo/infinitybook/v4/default.nix similarity index 100% rename from tuxedo/infinitybook/v4/default.nix rename to nixos/hardware/tuxedo/infinitybook/v4/default.nix From ba2dcbce2346c1a6984a62815079996a3857ded1 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 20 Jun 2020 13:05:20 +0200 Subject: [PATCH 351/624] nixos/hardware: move CODEOWNERS to toplevel --- .github/CODEOWNERS | 9 +++++++++ nixos/hardware/CODEOWNERS | 7 ------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5376d51a6178..9b2fdd85c31d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -55,6 +55,15 @@ # NixOS integration test driver /nixos/lib/test-driver @tfc +# NixOS hardware descriptions +/nixos/hardware/beagleboard/pocketbeagle @yegortimoshenko +/nixos/hardware/dell/xps/13-9370 @moredread +/nixos/hardware/dell/xps/13-9380 @kalbasit +/nixos/hardware/lenovo/thinkpad/x230 @makefu @yegortimoshenko +/nixos/hardware/lenovo/thinkpad/x250 @Mic92 +/nixos/hardware/pcengines/apu @yegortimoshenko +/nixos/hardware/purism/librem/13v3 @yegortimoshenko + # Updaters ## update.nix /maintainers/scripts/update.nix @jtojnar diff --git a/nixos/hardware/CODEOWNERS b/nixos/hardware/CODEOWNERS index 4f2bb2cc6463..e69de29bb2d1 100644 --- a/nixos/hardware/CODEOWNERS +++ b/nixos/hardware/CODEOWNERS @@ -1,7 +0,0 @@ -beagleboard/pocketbeagle @yegortimoshenko -dell/xps/13-9370 @moredread -dell/xps/13-9380 @kalbasit -lenovo/thinkpad/x230 @makefu @yegortimoshenko -lenovo/thinkpad/x250 @Mic92 -pcengines/apu @yegortimoshenko -purism/librem/13v3 @yegortimoshenko From b89f6adb8419ac9980a7a8ee53d3e000ee4d82cb Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 20 Jun 2020 13:06:18 +0200 Subject: [PATCH 352/624] nixos/hardware: remove .gitignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s a full subset of the toplevel .gitignore. --- nixos/hardware/.gitignore | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 nixos/hardware/.gitignore diff --git a/nixos/hardware/.gitignore b/nixos/hardware/.gitignore deleted file mode 100644 index 2151b35ff51e..000000000000 --- a/nixos/hardware/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -*~ -,* -.*.swp -.*.swo -result -result-* -.version-suffix - -.DS_Store From d248e8a13b08a7e56194bf47ed781afa2dddcecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 20 Jun 2020 09:40:57 +0100 Subject: [PATCH 353/624] home-assistant: 0.111.0 -> 0.111.4 --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 9 ++------- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a87c6947a1a1..1c912368a7a4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.111.0"; + version = "0.111.4"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -796,7 +796,7 @@ "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf tensorflow]; + "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: tensorflow "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e198a35ad121..27c1a0a75263 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -22,11 +22,6 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py - # used by check_config script - # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved - (mkOverride "colorlog" "4.0.2" - "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42") - # required by the sun/moon plugins # https://github.com/home-assistant/core/issues/36636 (mkOverride "astral" "1.10.1" @@ -72,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.111.0"; + hassVersion = "0.111.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -91,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0zg7fng3cfksn4hr8vixsmj8cbag8h4dg4qi69n56hc71rnpl9kw"; + sha256 = "08dkqczpmdaz8k9fsshgvgma7i7sffzgmhsi49qki7vwn20hl2hf"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index a2445dad324b..fcb68896c29d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200603.2"; + version = "20200603.3"; src = fetchPypi { inherit pname version; - sha256 = "1p99f5q8frk5k5lh1gjxyq539p1iv9fslpbfirh8njx3d0a85l84"; + sha256 = "12bbvqckry6yr7409dir49pjcaa31z74fy6vb0mgr9xzvri5c2s8"; }; # no Python tests implemented From 4593482d4e14ae12edae5102747479b738fc2263 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 18 Jan 2020 12:00:00 +0000 Subject: [PATCH 354/624] nixos: add test for sslh --- nixos/tests/all-tests.nix | 1 + nixos/tests/sslh.nix | 83 +++++++++++++++++++++++++++++++++++ pkgs/servers/sslh/default.nix | 6 ++- 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/sslh.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 796c626f3dde..8316332e48ea 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -302,6 +302,7 @@ in spacecookie = handleTest ./spacecookie.nix {}; spike = handleTest ./spike.nix {}; sonarr = handleTest ./sonarr.nix {}; + sslh = handleTest ./sslh.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; diff --git a/nixos/tests/sslh.nix b/nixos/tests/sslh.nix new file mode 100644 index 000000000000..2a800aa52d0a --- /dev/null +++ b/nixos/tests/sslh.nix @@ -0,0 +1,83 @@ +import ./make-test-python.nix { + name = "sslh"; + + nodes = { + server = { pkgs, lib, ... }: { + networking.firewall.allowedTCPPorts = [ 443 ]; + networking.interfaces.eth1.ipv6.addresses = [ + { + address = "fe00:aa:bb:cc::2"; + prefixLength = 64; + } + ]; + # sslh is really slow when reverse dns does not work + networking.hosts = { + "fe00:aa:bb:cc::2" = [ "server" ]; + "fe00:aa:bb:cc::1" = [ "client" ]; + }; + services.sslh = { + enable = true; + transparent = true; + appendConfig = '' + protocols: + ( + { name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; }, + { name: "http"; host: "localhost"; port: "80"; probe: "builtin"; }, + ); + ''; + }; + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keyFiles = [ ./initrd-network-ssh/id_ed25519.pub ]; + services.nginx = { + enable = true; + virtualHosts."localhost" = { + addSSL = false; + default = true; + root = pkgs.runCommand "testdir" {} '' + mkdir "$out" + echo hello world > "$out/index.html" + ''; + }; + }; + }; + client = { ... }: { + networking.interfaces.eth1.ipv6.addresses = [ + { + address = "fe00:aa:bb:cc::1"; + prefixLength = 64; + } + ]; + networking.hosts."fe00:aa:bb:cc::2" = [ "server" ]; + environment.etc.sshKey = { + source = ./initrd-network-ssh/id_ed25519; # dont use this anywhere else + mode = "0600"; + }; + }; + }; + + testScript = '' + start_all() + + server.wait_for_unit("sslh.service") + server.wait_for_unit("nginx.service") + server.wait_for_unit("sshd.service") + server.wait_for_open_port(80) + server.wait_for_open_port(443) + server.wait_for_open_port(22) + + for arg in ["-6", "-4"]: + client.wait_until_succeeds(f"ping {arg} -c1 server") + + # check that ssh through sslh works + client.succeed( + f"ssh {arg} -p 443 -i /etc/sshKey -o StrictHostKeyChecking=accept-new server 'echo $SSH_CONNECTION > /tmp/foo{arg}'" + ) + + # check that 1/ the above ssh command had an effect 2/ transparent proxying really works + ip = "fe00:aa:bb:cc::1" if arg == "-6" else "192.168.1." + server.succeed(f"grep '{ip}' /tmp/foo{arg}") + + # check that http through sslh works + assert client.succeed(f"curl {arg} http://server:443").strip() == "hello world" + ''; +} diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index cbeacece3e1e..68fe9c4b08ed 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }: +{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }: stdenv.mkDerivation rec { pname = "sslh"; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + passthru.tests = { + inherit (nixosTests) sslh; + }; + meta = with stdenv.lib; { description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; license = licenses.gpl2Plus; From 2c282fb537c6917004d1193e44cedee64790dabe Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 20 Jun 2020 13:26:51 +0200 Subject: [PATCH 355/624] nixos/hardware: remove .travis.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We are going to have to integrate the tests differently, but it’s fine for now. --- nixos/hardware/.travis.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 nixos/hardware/.travis.yml diff --git a/nixos/hardware/.travis.yml b/nixos/hardware/.travis.yml deleted file mode 100644 index 91cf21da023e..000000000000 --- a/nixos/hardware/.travis.yml +++ /dev/null @@ -1,3 +0,0 @@ -language: nix -script: - ./tests/run.py From 5d0725a0632ce0ae7daa80755248b3e226392631 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 20 Jun 2020 08:21:15 -0400 Subject: [PATCH 356/624] Revert "Merge nixos-hardware into nixpkgs under `/nixos/hardware`" --- .github/CODEOWNERS | 9 - nixos/hardware/CODEOWNERS | 0 nixos/hardware/CONTRIBUTING.md | 31 - nixos/hardware/COPYING | 111 -- nixos/hardware/README.md | 115 -- nixos/hardware/acer/aspire/4810t/README.wiki | 110 -- nixos/hardware/acer/aspire/4810t/default.nix | 29 - nixos/hardware/airis/n990/default.nix | 21 - nixos/hardware/apple/default.nix | 12 - .../hardware/apple/macbook-air/3/default.nix | 15 - .../hardware/apple/macbook-air/4/default.nix | 16 - .../hardware/apple/macbook-air/6/default.nix | 18 - nixos/hardware/apple/macbook-air/default.nix | 8 - .../apple/macbook-pro/10-1/README.wiki | 9 - .../apple/macbook-pro/10-1/default.nix | 21 - .../hardware/apple/macbook-pro/11-5/README.md | 32 - .../apple/macbook-pro/11-5/default.nix | 27 - .../apple/macbook-pro/12-1/default.nix | 14 - nixos/hardware/apple/macbook-pro/default.nix | 7 - nixos/hardware/asus/wireless-ac1300.nix | 6 - nixos/hardware/audio-gd/compass2.nix | 7 - .../beagleboard/pocketbeagle/default.nix | 10 - nixos/hardware/common/cpu/amd/default.nix | 6 - nixos/hardware/common/cpu/intel/default.nix | 15 - .../common/cpu/intel/kaby-lake/default.nix | 8 - .../common/cpu/intel/sandy-bridge/default.nix | 9 - nixos/hardware/common/pc/default.nix | 5 - nixos/hardware/common/pc/hdd/default.nix | 7 - nixos/hardware/common/pc/laptop/acpi_call.nix | 10 - nixos/hardware/common/pc/laptop/default.nix | 7 - .../hardware/common/pc/laptop/hdd/default.nix | 8 - nixos/hardware/common/pc/laptop/ssd | 1 - nixos/hardware/common/pc/ssd/default.nix | 9 - nixos/hardware/default.nix | 3 - nixos/hardware/dell/e7240/README.md | 8 - nixos/hardware/dell/e7240/default.nix | 8 - nixos/hardware/dell/latitude/3480/default.nix | 14 - nixos/hardware/dell/xps/13-7390/README.wiki | 16 - nixos/hardware/dell/xps/13-7390/default.nix | 13 - nixos/hardware/dell/xps/13-9360/default.nix | 34 - .../dell/xps/13-9360/qca6174-firmware.nix | 26 - nixos/hardware/dell/xps/13-9370/README.wiki | 16 - nixos/hardware/dell/xps/13-9370/default.nix | 20 - nixos/hardware/dell/xps/13-9380/README.wiki | 20 - nixos/hardware/dell/xps/13-9380/default.nix | 18 - nixos/hardware/dell/xps/15-7590/README.wiki | 54 - nixos/hardware/dell/xps/15-7590/default.nix | 51 - nixos/hardware/dell/xps/15-9550/README.wiki | 52 - nixos/hardware/dell/xps/15-9550/default.nix | 18 - nixos/hardware/dell/xps/15-9560/README.wiki | 54 - nixos/hardware/dell/xps/15-9560/default.nix | 24 - .../dell/xps/15-9560/intel/default.nix | 18 - .../dell/xps/15-9560/nvidia/default.nix | 20 - .../hardware/dell/xps/15-9560/xps-common.nix | 12 - nixos/hardware/google/pixelbook/default.nix | 9 - .../hardware/inversepath/usbarmory/README.txt | 6 - .../inversepath/usbarmory/default.nix | 46 - nixos/hardware/inversepath/usbarmory/host.nix | 19 - .../inversepath/usbarmory/kernel.config | 995 ------------------ .../hardware/inversepath/usbarmory/kernel.nix | 20 - .../inversepath/usbarmory/usbarmory-dts.patch | 418 -------- nixos/hardware/lenovo/ideapad/default.nix | 3 - .../hardware/lenovo/ideapad/z510/default.nix | 11 - nixos/hardware/lenovo/thinkpad/default.nix | 11 - .../hardware/lenovo/thinkpad/e495/default.nix | 11 - .../hardware/lenovo/thinkpad/l13/default.nix | 10 - .../hardware/lenovo/thinkpad/p53/default.nix | 10 - .../hardware/lenovo/thinkpad/t410/default.nix | 36 - .../hardware/lenovo/thinkpad/t420/default.nix | 9 - .../hardware/lenovo/thinkpad/t430/default.nix | 16 - .../lenovo/thinkpad/t440p/default.nix | 16 - .../lenovo/thinkpad/t440s/default.nix | 14 - .../lenovo/thinkpad/t450s/default.nix | 9 - .../lenovo/thinkpad/t460s/default.nix | 9 - .../lenovo/thinkpad/t470s/default.nix | 9 - .../lenovo/thinkpad/t480s/default.nix | 11 - .../hardware/lenovo/thinkpad/t490/default.nix | 31 - .../thinkpad/t490/t490-profile-set.conf | 107 -- .../hardware/lenovo/thinkpad/t495/default.nix | 16 - nixos/hardware/lenovo/thinkpad/tp-smapi.nix | 11 - .../lenovo/thinkpad/x1-extreme/default.nix | 8 - .../thinkpad/x1-extreme/gen2/default.nix | 48 - .../thinkpad/x1/6th-gen/QHD/default.nix | 36 - .../lenovo/thinkpad/x1/6th-gen/default.nix | 20 - .../lenovo/thinkpad/x1/7th-gen/audio.nix | 15 - .../lenovo/thinkpad/x1/7th-gen/default.nix | 7 - nixos/hardware/lenovo/thinkpad/x1/default.nix | 6 - .../lenovo/thinkpad/x140e/default.nix | 14 - .../hardware/lenovo/thinkpad/x220/default.nix | 10 - .../hardware/lenovo/thinkpad/x230/default.nix | 19 - .../hardware/lenovo/thinkpad/x250/default.nix | 7 - .../hardware/lenovo/thinkpad/x260/default.nix | 12 - .../hardware/lenovo/thinkpad/x270/default.nix | 6 - .../hardware/lenovo/thinkpad/x280/default.nix | 12 - nixos/hardware/microsoft/hyper-v/README.md | 63 -- .../microsoft/surface-pro/3/README.wiki | 41 - .../microsoft/surface-pro/3/default.nix | 9 - nixos/hardware/pcengines/apu/default.nix | 8 - nixos/hardware/purism/librem/13v3/README.md | 87 -- nixos/hardware/purism/librem/13v3/default.nix | 13 - nixos/hardware/purism/librem/15v3 | 1 - nixos/hardware/raspberry-pi/2/README.org | 23 - nixos/hardware/raspberry-pi/2/default.nix | 32 - nixos/hardware/samsung/np900x3c/README.wiki | 94 -- nixos/hardware/samsung/np900x3c/default.nix | 7 - .../supermicro/a1sri-2758f/default.nix | 9 - .../hardware/supermicro/x10sll-f/default.nix | 12 - nixos/hardware/tests/build-profile.nix | 19 - nixos/hardware/tests/run.py | 116 -- nixos/hardware/toshiba/swanky/README.md | 66 -- nixos/hardware/toshiba/swanky/default.nix | 27 - .../tuxedo/infinitybook/v4/default.nix | 5 - 112 files changed, 3927 deletions(-) delete mode 100644 nixos/hardware/CODEOWNERS delete mode 100644 nixos/hardware/CONTRIBUTING.md delete mode 100644 nixos/hardware/COPYING delete mode 100644 nixos/hardware/README.md delete mode 100644 nixos/hardware/acer/aspire/4810t/README.wiki delete mode 100644 nixos/hardware/acer/aspire/4810t/default.nix delete mode 100644 nixos/hardware/airis/n990/default.nix delete mode 100644 nixos/hardware/apple/default.nix delete mode 100644 nixos/hardware/apple/macbook-air/3/default.nix delete mode 100644 nixos/hardware/apple/macbook-air/4/default.nix delete mode 100644 nixos/hardware/apple/macbook-air/6/default.nix delete mode 100644 nixos/hardware/apple/macbook-air/default.nix delete mode 100644 nixos/hardware/apple/macbook-pro/10-1/README.wiki delete mode 100644 nixos/hardware/apple/macbook-pro/10-1/default.nix delete mode 100644 nixos/hardware/apple/macbook-pro/11-5/README.md delete mode 100644 nixos/hardware/apple/macbook-pro/11-5/default.nix delete mode 100644 nixos/hardware/apple/macbook-pro/12-1/default.nix delete mode 100644 nixos/hardware/apple/macbook-pro/default.nix delete mode 100644 nixos/hardware/asus/wireless-ac1300.nix delete mode 100644 nixos/hardware/audio-gd/compass2.nix delete mode 100644 nixos/hardware/beagleboard/pocketbeagle/default.nix delete mode 100644 nixos/hardware/common/cpu/amd/default.nix delete mode 100644 nixos/hardware/common/cpu/intel/default.nix delete mode 100644 nixos/hardware/common/cpu/intel/kaby-lake/default.nix delete mode 100644 nixos/hardware/common/cpu/intel/sandy-bridge/default.nix delete mode 100644 nixos/hardware/common/pc/default.nix delete mode 100644 nixos/hardware/common/pc/hdd/default.nix delete mode 100644 nixos/hardware/common/pc/laptop/acpi_call.nix delete mode 100644 nixos/hardware/common/pc/laptop/default.nix delete mode 100644 nixos/hardware/common/pc/laptop/hdd/default.nix delete mode 120000 nixos/hardware/common/pc/laptop/ssd delete mode 100644 nixos/hardware/common/pc/ssd/default.nix delete mode 100644 nixos/hardware/default.nix delete mode 100644 nixos/hardware/dell/e7240/README.md delete mode 100644 nixos/hardware/dell/e7240/default.nix delete mode 100644 nixos/hardware/dell/latitude/3480/default.nix delete mode 100644 nixos/hardware/dell/xps/13-7390/README.wiki delete mode 100644 nixos/hardware/dell/xps/13-7390/default.nix delete mode 100644 nixos/hardware/dell/xps/13-9360/default.nix delete mode 100644 nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix delete mode 100644 nixos/hardware/dell/xps/13-9370/README.wiki delete mode 100644 nixos/hardware/dell/xps/13-9370/default.nix delete mode 100644 nixos/hardware/dell/xps/13-9380/README.wiki delete mode 100644 nixos/hardware/dell/xps/13-9380/default.nix delete mode 100644 nixos/hardware/dell/xps/15-7590/README.wiki delete mode 100644 nixos/hardware/dell/xps/15-7590/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9550/README.wiki delete mode 100644 nixos/hardware/dell/xps/15-9550/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9560/README.wiki delete mode 100644 nixos/hardware/dell/xps/15-9560/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9560/intel/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9560/nvidia/default.nix delete mode 100644 nixos/hardware/dell/xps/15-9560/xps-common.nix delete mode 100644 nixos/hardware/google/pixelbook/default.nix delete mode 100644 nixos/hardware/inversepath/usbarmory/README.txt delete mode 100644 nixos/hardware/inversepath/usbarmory/default.nix delete mode 100644 nixos/hardware/inversepath/usbarmory/host.nix delete mode 100644 nixos/hardware/inversepath/usbarmory/kernel.config delete mode 100644 nixos/hardware/inversepath/usbarmory/kernel.nix delete mode 100644 nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch delete mode 100644 nixos/hardware/lenovo/ideapad/default.nix delete mode 100644 nixos/hardware/lenovo/ideapad/z510/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/e495/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/l13/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/p53/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t410/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t420/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t430/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t440p/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t440s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t450s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t460s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t470s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t480s/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t490/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf delete mode 100644 nixos/hardware/lenovo/thinkpad/t495/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/tp-smapi.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x1/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x140e/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x220/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x230/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x250/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x260/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x270/default.nix delete mode 100644 nixos/hardware/lenovo/thinkpad/x280/default.nix delete mode 100644 nixos/hardware/microsoft/hyper-v/README.md delete mode 100644 nixos/hardware/microsoft/surface-pro/3/README.wiki delete mode 100644 nixos/hardware/microsoft/surface-pro/3/default.nix delete mode 100644 nixos/hardware/pcengines/apu/default.nix delete mode 100644 nixos/hardware/purism/librem/13v3/README.md delete mode 100644 nixos/hardware/purism/librem/13v3/default.nix delete mode 120000 nixos/hardware/purism/librem/15v3 delete mode 100644 nixos/hardware/raspberry-pi/2/README.org delete mode 100644 nixos/hardware/raspberry-pi/2/default.nix delete mode 100644 nixos/hardware/samsung/np900x3c/README.wiki delete mode 100644 nixos/hardware/samsung/np900x3c/default.nix delete mode 100644 nixos/hardware/supermicro/a1sri-2758f/default.nix delete mode 100644 nixos/hardware/supermicro/x10sll-f/default.nix delete mode 100644 nixos/hardware/tests/build-profile.nix delete mode 100755 nixos/hardware/tests/run.py delete mode 100644 nixos/hardware/toshiba/swanky/README.md delete mode 100644 nixos/hardware/toshiba/swanky/default.nix delete mode 100644 nixos/hardware/tuxedo/infinitybook/v4/default.nix diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9b2fdd85c31d..5376d51a6178 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -55,15 +55,6 @@ # NixOS integration test driver /nixos/lib/test-driver @tfc -# NixOS hardware descriptions -/nixos/hardware/beagleboard/pocketbeagle @yegortimoshenko -/nixos/hardware/dell/xps/13-9370 @moredread -/nixos/hardware/dell/xps/13-9380 @kalbasit -/nixos/hardware/lenovo/thinkpad/x230 @makefu @yegortimoshenko -/nixos/hardware/lenovo/thinkpad/x250 @Mic92 -/nixos/hardware/pcengines/apu @yegortimoshenko -/nixos/hardware/purism/librem/13v3 @yegortimoshenko - # Updaters ## update.nix /maintainers/scripts/update.nix @jtojnar diff --git a/nixos/hardware/CODEOWNERS b/nixos/hardware/CODEOWNERS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/nixos/hardware/CONTRIBUTING.md b/nixos/hardware/CONTRIBUTING.md deleted file mode 100644 index ea468923ae10..000000000000 --- a/nixos/hardware/CONTRIBUTING.md +++ /dev/null @@ -1,31 +0,0 @@ -# Writing profiles - -When setting an option, use `lib.mkDefault` unless: -- The option *must* be set and the user should get an error if they try to override it. -- The setting should merge with the user's settings (typical for list or set options). - -For example: - -```nix -{ lib }: { - # Using mkDefault, because the user might want to disable tlp - services.tlp.enable = lib.mkDefault true; - # No need to use mkDefault, because the setting will merge with the user's setting - boot.kernelModules = [ "tmp_smapi" ]; -} -``` - -Try to avoid "opinionated" settings relating to optional features like sound, bluetooth, choice of bootloader etc. - -Where possible, use module imports to share code between similar hardware variants. - -# Performance - -Profiles should favor usability and stability, so performance improvements should either be conservative or -be guarded behind additional NixOS module options. - -If it makes sense to have a performance-focussed config, it can be declared in a separate profile. - -# Testing - -Because profiles can only be tested with the appropriate hardware, quality assurance is up to *you*. diff --git a/nixos/hardware/COPYING b/nixos/hardware/COPYING deleted file mode 100644 index 47c6e27d1700..000000000000 --- a/nixos/hardware/COPYING +++ /dev/null @@ -1,111 +0,0 @@ -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator and -subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for the -purpose of contributing to a commons of creative, cultural and scientific -works ("Commons") that the public can reliably and without fear of later -claims of infringement build upon, modify, incorporate in other works, reuse -and redistribute as freely as possible in any form whatsoever and for any -purposes, including without limitation commercial purposes. These owners may -contribute to the Commons to promote the ideal of a free culture and the -further production of creative, cultural and scientific works, or to gain -reputation or greater distribution for their Work in part through the use and -efforts of others. - -For these and/or other purposes and motivations, and without any expectation -of additional consideration or compensation, the person associating CC0 with a -Work (the "Affirmer"), to the extent that he or she is an owner of Copyright -and Related Rights in the Work, voluntarily elects to apply CC0 to the Work -and publicly distribute the Work under its terms, with knowledge of his or her -Copyright and Related Rights in the Work and the meaning and intended legal -effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not limited -to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, communicate, - and translate a Work; - - ii. moral rights retained by the original author(s) and/or performer(s); - - iii. publicity and privacy rights pertaining to a person's image or likeness - depicted in a Work; - - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - - v. rights protecting the extraction, dissemination, use and reuse of data in - a Work; - - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation thereof, - including any amended or successor version of such directive); and - - vii. other similar, equivalent or corresponding rights throughout the world - based on applicable law or treaty, and any national implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention of, -applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and -unconditionally waives, abandons, and surrenders all of Affirmer's Copyright -and Related Rights and associated claims and causes of action, whether now -known or unknown (including existing as well as future claims and causes of -action), in the Work (i) in all territories worldwide, (ii) for the maximum -duration provided by applicable law or treaty (including future time -extensions), (iii) in any current or future medium and for any number of -copies, and (iv) for any purpose whatsoever, including without limitation -commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes -the Waiver for the benefit of each member of the public at large and to the -detriment of Affirmer's heirs and successors, fully intending that such Waiver -shall not be subject to revocation, rescission, cancellation, termination, or -any other legal or equitable action to disrupt the quiet enjoyment of the Work -by the public as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason be -judged legally invalid or ineffective under applicable law, then the Waiver -shall be preserved to the maximum extent permitted taking into account -Affirmer's express Statement of Purpose. In addition, to the extent the Waiver -is so judged Affirmer hereby grants to each affected person a royalty-free, -non transferable, non sublicensable, non exclusive, irrevocable and -unconditional license to exercise Affirmer's Copyright and Related Rights in -the Work (i) in all territories worldwide, (ii) for the maximum duration -provided by applicable law or treaty (including future time extensions), (iii) -in any current or future medium and for any number of copies, and (iv) for any -purpose whatsoever, including without limitation commercial, advertising or -promotional purposes (the "License"). The License shall be deemed effective as -of the date CC0 was applied by Affirmer to the Work. Should any part of the -License for any reason be judged legally invalid or ineffective under -applicable law, such partial invalidity or ineffectiveness shall not -invalidate the remainder of the License, and in such case Affirmer hereby -affirms that he or she will not (i) exercise any of his or her remaining -Copyright and Related Rights in the Work or (ii) assert any associated claims -and causes of action with respect to the Work, in either case contrary to -Affirmer's express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - - b. Affirmer offers the Work as-is and makes no representations or warranties - of any kind concerning the Work, express, implied, statutory or otherwise, - including without limitation warranties of title, merchantability, fitness - for a particular purpose, non infringement, or the absence of latent or - other defects, accuracy, or the present or absence of errors, whether or not - discoverable, all to the greatest extent permissible under applicable law. - - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without limitation - any person's Copyright and Related Rights in the Work. Further, Affirmer - disclaims responsibility for obtaining any necessary consents, permissions - or other rights required for any use of the Work. - - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to this - CC0 or use of the Work. diff --git a/nixos/hardware/README.md b/nixos/hardware/README.md deleted file mode 100644 index 1dff0a8daad1..000000000000 --- a/nixos/hardware/README.md +++ /dev/null @@ -1,115 +0,0 @@ -NixOS profiles covering hardware quirks. - -## Setup - -Add and update `nixos-hardware` channel: - -``` -$ sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware -$ sudo nix-channel --update -``` - -Then import an appropriate profile path from the table below. For example, to -enable ThinkPad X220 profile, your `imports` in `/etc/nixos/configuration.nix` -should look like: - -``` -imports = [ - - ./hardware-configuration.nix -]; -``` - -## Incomplete list of Profiles - -See code for all available configurations. - -| Model | Path | -| --------------------------------- | -------------------------------------------------- | -| [Acer Aspire 4810T][] | `` | -| Airis N990 | `` | -| Apple MacBook Air 3,X | `` | -| Apple MacBook Air 4,X | `` | -| Apple MacBook Air 6,X | `` | -| [Apple MacBook Pro 10,1][] | `` | -| Apple MacBook Pro 12,1 | `` | -| BeagleBoard PocketBeagle | `` | -| Dell Latitude 3480 | `` | -| [Dell XPS E7240][] | `` | -| [Dell XPS 13 7390][] | `` | -| [Dell XPS 13 9360][] | `` | -| [Dell XPS 13 9370][] | `` | -| [Dell XPS 13 9380][] | `` | -| [Dell XPS 15 7590][] | `` | -| [Dell XPS 15 9550][] | `` | -| [Dell XPS 15 9560][] | `` | -| [Dell XPS 15 9560, intel only][] | `` | -| [Dell XPS 15 9560, nvidia only][] | `` | -| [Google Pixelbook][] | `` | -| [Inverse Path USB armory][] | `` | -| Lenovo IdeaPad Z510 | `` | -| Lenovo ThinkPad E495 | `` | -| Lenovo ThinkPad L13 | `` | -| Lenovo ThinkPad P53 | `` | -| Lenovo ThinkPad T410 | `` | -| Lenovo ThinkPad T420 | `` | -| Lenovo ThinkPad T430 | `` | -| Lenovo ThinkPad T440s | `` | -| Lenovo ThinkPad T440p | `` | -| Lenovo ThinkPad T450s | `` | -| Lenovo ThinkPad T460s | `` | -| Lenovo ThinkPad T470s | `` | -| Lenovo ThinkPad T480s | `` | -| Lenovo ThinkPad T490 | `` | -| Lenovo ThinkPad T495 | `` | -| Lenovo ThinkPad X140e | `` | -| Lenovo ThinkPad X220 | `` | -| Lenovo ThinkPad X230 | `` | -| Lenovo ThinkPad X250 | `` | -| [Lenovo ThinkPad X260][] | `` | -| Lenovo ThinkPad X270 | `` | -| Lenovo ThinkPad X280 | `` | -| [Lenovo ThinkPad X1 (6th Gen)][] | `` | -| [Lenovo ThinkPad X1 (7th Gen)][] | `` | -| Lenovo ThinkPad X1 Extreme Gen 2 | `` | -| [Microsoft Surface Pro 3][] | `` | -| PC Engines APU | `` | -| [Raspberry Pi 2][] | `` | -| [Samsung Series 9 NP900X3C][] | `` | -| [Purism Librem 13v3][] | `` | -| [Purism Librem 15v3][] | `` | -| Supermicro A1SRi-2758F | `` | -| Supermicro X10SLL-F | `` | -| [Toshiba Chromebook 2 `swanky`][] | `` | -| [Tuxedo InfinityBook v4][] | `` | - -[Acer Aspire 4810T]: acer/aspire/4810t -[Apple MacBook Pro 10,1]: apple/macbook-pro/10-1 -[Dell XPS E7240]: dell/e7240 -[Dell XPS 13 7390]: dell/xps/13-7390 -[Dell XPS 13 9360]: dell/xps/13-9360 -[Dell XPS 13 9370]: dell/xps/13-9370 -[Dell XPS 13 9380]: dell/xps/13-9380 -[Dell XPS 15 7590]: dell/xps/15-7590 -[Dell XPS 15 9550]: dell/xps/15-9550 -[Dell XPS 15 9560]: dell/xps/15-9560 -[Dell XPS 15 9560, intel only]: dell/xps/15-9560/intel -[Dell XPS 15 9560, nvidia only]: dell/xps/15-9560/nvidia -[Google Pixelbook]: google/pixelbook -[Inverse Path USB armory]: inversepath/usbarmory -[Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen -[Lenovo ThinkPad X1 (7th Gen)]: lenovo/thinkpad/x1/7th-gen -[Lenovo ThinkPad X260]: lenovo/thinkpad/x260 -[Microsoft Surface Pro 3]: microsoft/surface-pro/3 -[Raspberry Pi 2]: raspberry-pi/2 -[Samsung Series 9 NP900X3C]: samsung/np900x3c -[Purism Librem 13v3]: purism/librem/13v3 -[Purism Librem 13v5]: purism/librem/13v5 -[Toshiba Chromebook 2 `swanky`]: toshiba/swanky -[Tuxedo InfinityBook v4]: nixos-hardware/tuxedo/infinitybook/v4 - -## How to contribute a new device profile - -1. Add your device profile expression in the appropriate directory -2. Link it in the table in README.md -3. Run ./tests/run.py to test it. The test script script will parse all the profiles from the README.md diff --git a/nixos/hardware/acer/aspire/4810t/README.wiki b/nixos/hardware/acer/aspire/4810t/README.wiki deleted file mode 100644 index 0b045b6e4da8..000000000000 --- a/nixos/hardware/acer/aspire/4810t/README.wiki +++ /dev/null @@ -1,110 +0,0 @@ -= Overview = -* CPU: Intel Core 2 Solo U3500 @ 1.40GHz (speeds: 0.8, 1.2 and 1.4GHz), 3MB L2 -* Screen: 1366x768 LED - -= BIOS versions = -* 1.10 - average ACPI temperature around 34°C, good GL playing -* 1.20 - average ACPI temperature around 39°C, good GL playing -* 1.31 - big slowdown in X windows from time to time, GL games with annoying slowdowns regularly - -The most recent BIOS updates (1.20 onwards) come with a DOS flasher; older come only with a windows flasher. I used a [http://www.pcengines.ch/freedos.htm freedos image] stored in a USB flash memory to boot freedos and flash the BIOS. - -= Drivers = -All provided in linux 2.6.32 kernels. - -Linux 2.6.29 has problems at least with the wire ethernet card (Attansic Technology Corp. Device 1063). Loading and unloading the ethernet card driver module (atl1c) helps getting a working link, although it will change from eth0 to eth1, eth2, or another interface name. - -== lspci == - 00:00.0 Host bridge: Intel Corporation Mobile 4 Series Chipset Memory Controller Hub (rev 07) - 00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07) - 00:02.1 Display controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07) - 00:1a.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #4 (rev 03) - 00:1a.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #5 (rev 03) - 00:1a.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #2 (rev 03) - 00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 03) - 00:1c.0 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 1 (rev 03) - 00:1c.1 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 2 (rev 03) - 00:1d.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #1 (rev 03) - 00:1d.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #2 (rev 03) - 00:1d.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #3 (rev 03) - 00:1d.3 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #6 (rev 03) - 00:1d.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #1 (rev 03) - 00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev 93) - 00:1f.0 ISA bridge: Intel Corporation ICH9M-E LPC Interface Controller (rev 03) - 00:1f.2 IDE interface: Intel Corporation ICH9M/M-E 2 port SATA IDE Controller (rev 03) - 00:1f.3 SMBus: Intel Corporation 82801I (ICH9 Family) SMBus Controller (rev 03) - 00:1f.5 IDE interface: Intel Corporation ICH9M/M-E 2 port SATA IDE Controller (rev 03) - 00:1f.6 Signal processing controller: Intel Corporation 82801I (ICH9 Family) Thermal Subsystem (rev 03) - 01:00.0 Ethernet controller: Attansic Technology Corp. Device 1063 (rev c0) - 02:00.0 Network controller: Intel Corporation Wireless WiFi Link 5100 - -= Configuration = - - { - # Make te network WLAN card (wlan0) firmware available - require = [ ./nixos/modules/hardware/network/intel-5000.nix ]; - - boot = rec { - initrd = { - kernelModules = [ "ata_piix" "reiserfs" ]; - }; - kernelParams = [ - "selinux=0" - "apm=on" - "acpi=on" - "vga=0x317" - "console=tty1" - "video=vesafb:ywrap" - # Important, to disable Kernel Mode Setting for the graphics card - # This will allow backlight regulation - "nomodeset" - ]; - kernelModules = [ - "acpi-cpufreq" - "cpufreq-ondemand" # not autoloaded in 2.6.32.2 - "kvm-intel" - ]; - resumeDevice = "8:2"; - extraKernelParams = ["resume=/dev/sda2"]; - kernelPackages = pkgs.kernelPackages_2_6_32; - postBootCommands = '' - echo ondemand > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - ''; - }; - - services = { - xserver = { - enable = true; - defaultDepth = 24; - videoDriver = "intel"; - exportConfiguration = true; - enableTCP = true; - autorun = true; - driSupport = false; - synaptics = { - enable = true; - dev = "/dev/input/event8"; - }; - }; - }; - -= X settings = - -== Backlight == -Having disabled Kernel Mode Setting for the i915 kernel drm module (kernel parameter ''nomodeset''), use ''xrandr'' to set: - xrandr --output LVDS --set BACKLIGHT_CONTROL combination - xrandr --output LVDS --set BACKLIGHT 300 # ~1000, max light. - -If those steps make your mouse cursor not appear, switch to another VT, and then back to X, and it will come. - -== Synaptics pad == -I like the pad speed set by: - synclient MaxTapTime=0 MaxSpeed=1.12 MinSpeed=0.6 AccelFactor=0.001 VertEdgeScroll=1 -Install the ''xf86-input-synaptics-1.2.0'' for ''synclient'' to be in your PATH. - -= Suspending and hibernating = -Usual pm-utils work, with pm-suspend and pm-hibernate. - -[[Category:Installation]] -[[Category:Hardware]] -[[Category:Laptops]] diff --git a/nixos/hardware/acer/aspire/4810t/default.nix b/nixos/hardware/acer/aspire/4810t/default.nix deleted file mode 100644 index d40b454b3aa4..000000000000 --- a/nixos/hardware/acer/aspire/4810t/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ]; - - boot = { - initrd.kernelModules = [ "ata_piix" ]; - kernelParams = [ - "apm=on" - "acpi=on" - "vga=0x317" - "video=vesafb:ywrap" - - # Important, disable KMS to fix backlight regulation: - "nomodeset" - ]; - }; - - # TODO: reverse compat - hardware.opengl.driSupport = false; - - # TODO: reverse compat - services.xserver = { - defaultDepth = lib.mkDefault 24; - }; -} diff --git a/nixos/hardware/airis/n990/default.nix b/nixos/hardware/airis/n990/default.nix deleted file mode 100644 index ae06813131a8..000000000000 --- a/nixos/hardware/airis/n990/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ ../../common/pc/laptop ]; - - boot = { - initrd.kernelModules = [ "pata_via" ]; - - kernelParams = [ - "apm=on" - "acpi=on" - "vga=0x317" # 1024x768 - "console=tty1" - "video=vesafb:ywrap" # Faster scroll - ]; - }; - - hardware.firmware = with pkgs; [ intel2200BGFirmware ]; - - services.xserver.videoDrivers = [ "openchrome" ]; -} diff --git a/nixos/hardware/apple/default.nix b/nixos/hardware/apple/default.nix deleted file mode 100644 index a2ee26230aaa..000000000000 --- a/nixos/hardware/apple/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, lib, ... }: - -{ - boot.kernelParams = [ - "hid_apple.iso_layout=0" - ]; - - hardware.facetimehd.enable = lib.mkDefault - (config.nixpkgs.config.allowUnfree or false); - - services.mbpfan.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/apple/macbook-air/3/default.nix b/nixos/hardware/apple/macbook-air/3/default.nix deleted file mode 100644 index 03221edcd0b0..000000000000 --- a/nixos/hardware/apple/macbook-air/3/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, ... }: - -{ - imports = [ - ../../. - ../../../common/pc/laptop - ../../../common/pc/ssd - ]; - - # Built-in iSight is recognized by the generic uvcvideo kernel module - hardware.facetimehd.enable = false; - - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/hardware/apple/macbook-air/4/default.nix b/nixos/hardware/apple/macbook-air/4/default.nix deleted file mode 100644 index 181a099799a1..000000000000 --- a/nixos/hardware/apple/macbook-air/4/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel/sandy-bridge - ]; - - boot.kernelParams = [ - "acpi_backlight=vendor" - ]; - - services.xserver.deviceSection = lib.mkDefault '' - Option "TearFree" "true" - ''; -} diff --git a/nixos/hardware/apple/macbook-air/6/default.nix b/nixos/hardware/apple/macbook-air/6/default.nix deleted file mode 100644 index 555d70418b85..000000000000 --- a/nixos/hardware/apple/macbook-air/6/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, ... }: - -{ - imports = [ ../. ]; - - boot = { - extraModulePackages = with config.boot.kernelPackages; [ mba6x_bl ]; - kernelModules = [ "mba6x_bl" ]; - - # Divides power consumption by two. - kernelParams = [ "acpi_osi=" ]; - }; - - services.xserver.deviceSection = lib.mkDefault '' - Option "Backlight" "mba6x_backlight" - Option "TearFree" "true" - ''; -} diff --git a/nixos/hardware/apple/macbook-air/default.nix b/nixos/hardware/apple/macbook-air/default.nix deleted file mode 100644 index ea15175d0319..000000000000 --- a/nixos/hardware/apple/macbook-air/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ - ../. - ../../common/cpu/intel - ../../common/pc/laptop - ../../common/pc/laptop/ssd - ]; -} diff --git a/nixos/hardware/apple/macbook-pro/10-1/README.wiki b/nixos/hardware/apple/macbook-pro/10-1/README.wiki deleted file mode 100644 index 149b30e6ed22..000000000000 --- a/nixos/hardware/apple/macbook-pro/10-1/README.wiki +++ /dev/null @@ -1,9 +0,0 @@ -= Apple MacBook Pro 10,1 = - -I presume the associated configuration also will work with to other 10,x models. - -If you don't have an Ethernet adapter, make sure your NixOS installer has a sufficiently modern kernel or you will be stuck without internet and unable to installer. - -Note that (with NixPkgs circa late October 2016) Linux 4.8.1 does not work: everything will boot through X, but then manually-run commands accessing peripherals (nmcli, lspci, etc) will hang inexplicably. - -Thankfully no tweaking of the BIOS or similar was needed. Do note that if your MacOS partition is encrypted, you will have an easier time shrinking it from within MacOS, but this is standard advice. diff --git a/nixos/hardware/apple/macbook-pro/10-1/default.nix b/nixos/hardware/apple/macbook-pro/10-1/default.nix deleted file mode 100644 index e029ef21ecac..000000000000 --- a/nixos/hardware/apple/macbook-pro/10-1/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/pc/laptop/ssd - ]; - - # TODO: boot loader - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # TODO: reverse compat - hardware.opengl.driSupport32Bit = true; - - services.xserver = { - # TODO: we should not enable unfree drivers - # when there is an alternative (i.e. nouveau) - videoDrivers = [ "nvidia" ]; - }; -} diff --git a/nixos/hardware/apple/macbook-pro/11-5/README.md b/nixos/hardware/apple/macbook-pro/11-5/README.md deleted file mode 100644 index 17e5ef1d36e0..000000000000 --- a/nixos/hardware/apple/macbook-pro/11-5/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# Apple MacBook Pro 11,5 - -This configuration will **not** work with MacBook Pro 11,2 or 11,3 models. - -## Notable features - -* Prevent intermittent USB 3.0 controller wakeup signal when the lid is closed. Without this fix your laptop may get very hot and drain the battery after waking up in your laptop bag. - - You can see for yourself which devices are allowed to wake up your laptop using the command: - - ```shell - cat /proc/acpi/wakeup - ``` - - This fix works for Linux kernel 3.13 and above. - - Sources: - - * [Fix unwanted laptop resume after lid is closed](https://medium.com/@laurynas.karvelis_95228/install-arch-linux-on-macbook-pro-11-2-retina-install-guide-for-year-2017-2034ceed4cb2#66ba) - * [Arch wiki: MacBookPro11,x Suspend](https://wiki.archlinux.org/index.php/MacBookPro11,x#Suspend) - * [simonvandel/dotfiles (nix config)](https://github.com/simonvandel/dotfiles/blob/f254a4a607257faee295ce798ed215273c342850/nixos/vandel-macair/configuration.nix#L45) - -## Graphics - -The [MacBookPro11,4 and MacBookPro11,5](https://support.apple.com/kb/SP719) models ship with a discrete ATI graphics card (whereas MacBookPro11,2 and MacBookPro11,3 ship with NVidia cards). This is alongside the usual integrated Intel GPU. - -You may wish to look into dynamic switching between integrated and discrete graphics, but this config doesn't attempt it. - -## Additional resources - -* Arch linux wiki: [MacBookPro11,x](https://wiki.archlinux.org/index.php/MacBookPro11,x) -* Kernel patches: [MacBookPro11,x](https://bugzilla.kernel.org/buglist.cgi?quicksearch=macbookpro11) diff --git a/nixos/hardware/apple/macbook-pro/11-5/default.nix b/nixos/hardware/apple/macbook-pro/11-5/default.nix deleted file mode 100644 index a53b5d8adeb4..000000000000 --- a/nixos/hardware/apple/macbook-pro/11-5/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, config, pkgs, ... }: - -let - - kernelPackages = config.boot.kernelPackages; - -in - -{ - imports = [ - ../. - ../../../common/pc/laptop/ssd - - ]; - - # Apparently this is currently only supported by ati_unfree drivers, not ati - hardware.opengl.driSupport32Bit = false; - - services.xserver.videoDrivers = [ "ati" ]; - - services.udev.extraRules = - # Disable XHC1 wakeup signal to avoid resume getting triggered some time - # after suspend. Reboot required for this to take effect. - lib.optionalString - (lib.versionAtLeast kernelPackages.kernel.version "3.13") - ''SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled"''; -} diff --git a/nixos/hardware/apple/macbook-pro/12-1/default.nix b/nixos/hardware/apple/macbook-pro/12-1/default.nix deleted file mode 100644 index 02c6f328cf5a..000000000000 --- a/nixos/hardware/apple/macbook-pro/12-1/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../. - ../../../common/pc/laptop/ssd - - ]; - - # USB subsystem wakes up MBP right after suspend unless we disable it. - services.udev.extraRules = lib.mkDefault '' - SUBSYSTEM=="pci", KERNEL=="0000:00:14.0", ATTR{power/wakeup}="disabled" - ''; -} diff --git a/nixos/hardware/apple/macbook-pro/default.nix b/nixos/hardware/apple/macbook-pro/default.nix deleted file mode 100644 index 4ced65a382e0..000000000000 --- a/nixos/hardware/apple/macbook-pro/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ../. - ../../common/cpu/intel - ../../common/pc/laptop - ]; -} diff --git a/nixos/hardware/asus/wireless-ac1300.nix b/nixos/hardware/asus/wireless-ac1300.nix deleted file mode 100644 index 6e9b815a0eb0..000000000000 --- a/nixos/hardware/asus/wireless-ac1300.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: - -{ - boot.extraModulePackages = with config.boot.kernelPackages; [ rtl8812au ]; - boot.kernelModules = [ "8812au" ]; -} diff --git a/nixos/hardware/audio-gd/compass2.nix b/nixos/hardware/audio-gd/compass2.nix deleted file mode 100644 index 5268c1dab8d1..000000000000 --- a/nixos/hardware/audio-gd/compass2.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - boot = { - extraModprobeConfig = lib.mkDefault '' - options snd slots=snd_usb_audio,snd-hda-intel - ''; - }; -} diff --git a/nixos/hardware/beagleboard/pocketbeagle/default.nix b/nixos/hardware/beagleboard/pocketbeagle/default.nix deleted file mode 100644 index bc426300f458..000000000000 --- a/nixos/hardware/beagleboard/pocketbeagle/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ lib, ... }: - -{ - boot.kernelParams = [ "console=ttyO0,115200n8" ]; - - boot.loader = { - generic-extlinux-compatible.enable = lib.mkDefault true; - grub.enable = lib.mkDefault false; - }; -} diff --git a/nixos/hardware/common/cpu/amd/default.nix b/nixos/hardware/common/cpu/amd/default.nix deleted file mode 100644 index d8c48a263081..000000000000 --- a/nixos/hardware/common/cpu/amd/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, lib, ... }: - -{ - hardware.cpu.amd.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nixos/hardware/common/cpu/intel/default.nix b/nixos/hardware/common/cpu/intel/default.nix deleted file mode 100644 index ad945f394a6c..000000000000 --- a/nixos/hardware/common/cpu/intel/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot.initrd.kernelModules = [ "i915" ]; - - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; - - hardware.opengl.extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau - libvdpau-va-gl - intel-media-driver - ]; -} diff --git a/nixos/hardware/common/cpu/intel/kaby-lake/default.nix b/nixos/hardware/common/cpu/intel/kaby-lake/default.nix deleted file mode 100644 index e6a2d1ce8e6e..000000000000 --- a/nixos/hardware/common/cpu/intel/kaby-lake/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ ../. ]; - - boot.kernelParams = [ - "i915.enable_fbc=1" - "i915.enable_psr=2" - ]; -} diff --git a/nixos/hardware/common/cpu/intel/sandy-bridge/default.nix b/nixos/hardware/common/cpu/intel/sandy-bridge/default.nix deleted file mode 100644 index 682815cee473..000000000000 --- a/nixos/hardware/common/cpu/intel/sandy-bridge/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ ../. ]; - - # Enables RC6, RC6p and RC6pp. - # Last two are only available on Sandy Bridge CPUs (circa 2011). - boot.kernelParams = [ - "i915.enable_rc6=7" - ]; -} diff --git a/nixos/hardware/common/pc/default.nix b/nixos/hardware/common/pc/default.nix deleted file mode 100644 index 0b498ff1d20e..000000000000 --- a/nixos/hardware/common/pc/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, ... }: - -{ - services.xserver.libinput.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/common/pc/hdd/default.nix b/nixos/hardware/common/pc/hdd/default.nix deleted file mode 100644 index 8cc5ada0deb9..000000000000 --- a/nixos/hardware/common/pc/hdd/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, ... }: - -{ - boot.kernel.sysctl = { - "vm.swappiness" = lib.mkDefault 10; - }; -} diff --git a/nixos/hardware/common/pc/laptop/acpi_call.nix b/nixos/hardware/common/pc/laptop/acpi_call.nix deleted file mode 100644 index f8c17dcc4901..000000000000 --- a/nixos/hardware/common/pc/laptop/acpi_call.nix +++ /dev/null @@ -1,10 +0,0 @@ -# acpi_call makes tlp work for newer thinkpads - -{ config, ... }: - -{ - boot = { - kernelModules = [ "acpi_call" ]; - extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; - }; -} diff --git a/nixos/hardware/common/pc/laptop/default.nix b/nixos/hardware/common/pc/laptop/default.nix deleted file mode 100644 index 946d066d04d5..000000000000 --- a/nixos/hardware/common/pc/laptop/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, ... }: - -{ - imports = [ ../. ]; - - services.tlp.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/common/pc/laptop/hdd/default.nix b/nixos/hardware/common/pc/laptop/hdd/default.nix deleted file mode 100644 index 63f29d458c29..000000000000 --- a/nixos/hardware/common/pc/laptop/hdd/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, ... }: - -{ - imports = [ ../../hdd ]; - - # Hard disk protection if the laptop falls: - services.hdapsd.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/common/pc/laptop/ssd b/nixos/hardware/common/pc/laptop/ssd deleted file mode 120000 index e313834a4372..000000000000 --- a/nixos/hardware/common/pc/laptop/ssd +++ /dev/null @@ -1 +0,0 @@ -../ssd \ No newline at end of file diff --git a/nixos/hardware/common/pc/ssd/default.nix b/nixos/hardware/common/pc/ssd/default.nix deleted file mode 100644 index 00922e649938..000000000000 --- a/nixos/hardware/common/pc/ssd/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, ... }: - -{ - boot.kernel.sysctl = { - "vm.swappiness" = lib.mkDefault 1; - }; - - services.fstrim.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/default.nix b/nixos/hardware/default.nix deleted file mode 100644 index fbb5b77061ff..000000000000 --- a/nixos/hardware/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -# This file is necessary so nix-env -qa does not break, -# when nixos-hardware is used as a channel -{} diff --git a/nixos/hardware/dell/e7240/README.md b/nixos/hardware/dell/e7240/README.md deleted file mode 100644 index b712f4d2bc25..000000000000 --- a/nixos/hardware/dell/e7240/README.md +++ /dev/null @@ -1,8 +0,0 @@ -On some kernel versions user ashgillman has experiences suspend issues -(see https://bugzilla.redhat.com/show_bug.cgi?id=1597481). - -Try: - -```nix -boot.kernelPackages = pkgs.linuxPackages_4_14; -``` diff --git a/nixos/hardware/dell/e7240/default.nix b/nixos/hardware/dell/e7240/default.nix deleted file mode 100644 index 3334a745f8c3..000000000000 --- a/nixos/hardware/dell/e7240/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../common/cpu/intel - ../../common/pc/laptop - ]; -} diff --git a/nixos/hardware/dell/latitude/3480/default.nix b/nixos/hardware/dell/latitude/3480/default.nix deleted file mode 100644 index 86be458a1d96..000000000000 --- a/nixos/hardware/dell/latitude/3480/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ../../../common/pc/laptop/ssd - ]; - - # touchpad goes over i2c - boot.blacklistedKernelModules = [ "psmouse" ]; - - services.xserver.videoDrivers = lib.mkDefault [ "intel" ]; -} diff --git a/nixos/hardware/dell/xps/13-7390/README.wiki b/nixos/hardware/dell/xps/13-7390/README.wiki deleted file mode 100644 index 6ec37d0f4476..000000000000 --- a/nixos/hardware/dell/xps/13-7390/README.wiki +++ /dev/null @@ -1,16 +0,0 @@ -= Dell XPS 13 7390 = - -== Installation == - -You need to disable RAID and use AHCI instead as described [https://wiki.ubuntu.com/Dell/XPS/XPS-13-7390-2-in-1 here]. - -== Firmware upgrades == - -Note that this device is supported by [https://fwupd.org/ fwupd]. -To perform firmware upgrades just activate the service - - -services.fwupd.enable = true; - - -Then use fwupdmgr to perform updates. diff --git a/nixos/hardware/dell/xps/13-7390/default.nix b/nixos/hardware/dell/xps/13-7390/default.nix deleted file mode 100644 index 991e4352cb50..000000000000 --- a/nixos/hardware/dell/xps/13-7390/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ../../../common/pc/laptop/ssd - ]; - - boot.kernelParams = [ "mem_sleep_default=deep" ]; - - services.thermald.enable = true; -} diff --git a/nixos/hardware/dell/xps/13-9360/default.nix b/nixos/hardware/dell/xps/13-9360/default.nix deleted file mode 100644 index 439bbe09f564..000000000000 --- a/nixos/hardware/dell/xps/13-9360/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, pkgs, ... }: - -# TODO: move to general HiDPI profile -# 4K screen, use bigger console font -# i18n.consoleFont deprecated in >=20.03, choose option based on OS version -lib.recursiveUpdate -(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then { - console.font = lib.mkDefault "latarcyrheb-sun32"; -} else { - i18n.consoleFont = lib.mkDefault "latarcyrheb-sun32"; -}) { - imports = [ - ../../../common/cpu/intel/kaby-lake - ../../../common/pc/laptop - ]; - - boot.blacklistedKernelModules = [ "psmouse" ]; # touchpad goes over i2c - - # TODO: decide on boot loader policy - boot.loader = { - efi.canTouchEfiVariables = lib.mkDefault true; - systemd-boot.enable = lib.mkDefault true; - }; - - hardware.firmware = lib.mkBefore [ pkgs.qca6174-firmware ]; - - # TODO: upstream to NixOS/nixpkgs - nixpkgs.overlays = [(final: previous: { - qca6174-firmware = final.callPackage ./qca6174-firmware.nix {}; - })]; - - # This will save you money and possibly your life! - services.thermald.enable = true; -} diff --git a/nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix b/nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix deleted file mode 100644 index c5da6c183280..000000000000 --- a/nixos/hardware/dell/xps/13-9360/qca6174-firmware.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "${target}-firmware-${version}"; - version = "${branch}-00042"; - - branch = "4.4.1.c1"; - target = "QCA6174"; - - src = fetchurl { - url = "https://github.com/kvalo/ath10k-firmware/raw/952afa4949cb34193040cd4e7441e1aee50ac731/${target}/hw3.0/${branch}/firmware-6.bin_RM.${version}-QCARMSWP-1"; - sha256 = "01vvz3qhqw5l3yilcqgk1spk4y9k4qy7na7a57cbl037r231szdh"; - }; - - buildCommand = '' - install -D $src $out/lib/firmware/ath10k/${target}/hw3.0/firmware-6.bin - ''; - - meta = with stdenv.lib; { - description = "Updated firmware for the qca6174 wireless chip"; - homepage = "https://github.com/kvalo/ath10k-firmware/tree/master/QCA6174/hw3.0"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ yorickvp ]; - platforms = platforms.linux; - }; -} diff --git a/nixos/hardware/dell/xps/13-9370/README.wiki b/nixos/hardware/dell/xps/13-9370/README.wiki deleted file mode 100644 index 57b5e08d3850..000000000000 --- a/nixos/hardware/dell/xps/13-9370/README.wiki +++ /dev/null @@ -1,16 +0,0 @@ -= Dell XPS 13 9370 = - -== Battery drain when sleeping == - -The laptop uses the S2 sleep mode by default instead of S3, which leads to -draining a lot of battery during sleep. - -Though this is intentional by the manufacturer and might cause lockups when -forced I - @moredread - never had any issues with it. - -See https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370)#Power_Management -and https://bugzilla.kernel.org/show_bug.cgi?id=199689#c3 for reference - -== Additional resources == - -* Arch linux wiki: [https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370) Dell XPS 13 9370] diff --git a/nixos/hardware/dell/xps/13-9370/default.nix b/nixos/hardware/dell/xps/13-9370/default.nix deleted file mode 100644 index dbe852f0c27f..000000000000 --- a/nixos/hardware/dell/xps/13-9370/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel/kaby-lake - ../../../common/pc/laptop - ../../../common/pc/laptop/acpi_call.nix - ]; - - # Force S3 sleep mode. See README.wiki for details. - boot.kernelParams = [ "mem_sleep_default=deep" ]; - - # touchpad goes over i2c - boot.blacklistedKernelModules = [ "psmouse" ]; - - services.throttled.enable = lib.mkDefault true; - - # This will save you money and possibly your life! - services.thermald.enable = true; -} diff --git a/nixos/hardware/dell/xps/13-9380/README.wiki b/nixos/hardware/dell/xps/13-9380/README.wiki deleted file mode 100644 index c5ad61e3fd63..000000000000 --- a/nixos/hardware/dell/xps/13-9380/README.wiki +++ /dev/null @@ -1,20 +0,0 @@ -= Dell XPS 13 9380 = - -== Firmware upgrades == - -Note that this device is supported by [https://fwupd.org/ fwupd]. -To perform firmware upgrades just activate the service - - -services.fwupd.enable = true; - - -Then use fwupdmgr to perform updates. - -== Battery drain when sleeping == - -The laptop uses the S2 sleep mode by default instead of S3, which leads to -draining a lot of battery during sleep. - -See https://wiki.archlinux.org/index.php/Dell_XPS_13_(9370)#Power_Management -and https://bugzilla.kernel.org/show_bug.cgi?id=199689#c3 for reference diff --git a/nixos/hardware/dell/xps/13-9380/default.nix b/nixos/hardware/dell/xps/13-9380/default.nix deleted file mode 100644 index 162cc2618eb1..000000000000 --- a/nixos/hardware/dell/xps/13-9380/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ../../../common/pc/laptop/acpi_call.nix - ]; - - # Force S3 sleep mode. See README.wiki for details. - boot.kernelParams = [ "mem_sleep_default=deep" ]; - - # touchpad goes over i2c - boot.blacklistedKernelModules = [ "psmouse" ]; - - # This will save you money and possibly your life! - services.thermald.enable = true; -} diff --git a/nixos/hardware/dell/xps/15-7590/README.wiki b/nixos/hardware/dell/xps/15-7590/README.wiki deleted file mode 100644 index 052df2911f1b..000000000000 --- a/nixos/hardware/dell/xps/15-7590/README.wiki +++ /dev/null @@ -1,54 +0,0 @@ -= Dell XPS 15 7590 = -*Mostly copied from 15-9550 - -== Tested Hardware == - -* CPU: Intel(R) Core(TM) i9-9980HK -* RAM: 32 GB -* HDD: 1 TiB SSD -* Screen: 15" 4k (3840✕2160) -* Input: Touchscreen and trackpad. - -== Firmware Configuration == - -Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. - -=== Before installation === - -These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. - -* ''Disable Secure Boot (but keep UEFI Boot).'' Thankfully doing so is as easy as changing any other simple setting. - -* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) - -=== Wifi === -~~Wifi does not work with kernels older than 5.1 (firmware not present) or newer~~ (https://bbs.archlinux.org/viewtopic.php?id=247705) - -Update: The 48.ucode causes the Killer wifi card to crash. The iwlfwifi-cc-a0-46.ucode works perfectly. -default.nix contains an overlay that removes the offending ucode from the linux-firmware bundle. -To use it one also needs to enable unfree firmware in their own configuration (hardware.enableRedistributableFirmware = true;) - -``` - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.grub = { - device = "nodev"; - efiSupport = true; - efiInstallAsRemovable = true; - }; - boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_5_1; -``` -Disable the `canTouchEfiVariables` after a boot or two to prevent NVRAM wearout. - - -=== After installation === - -* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. - -=== Optional === - -* ''Update BIOS.'' According to Reddit, this helps with battery life. - -=== Troubleshooting === - diff --git a/nixos/hardware/dell/xps/15-7590/default.nix b/nixos/hardware/dell/xps/15-7590/default.nix deleted file mode 100644 index eeb69e204ee9..000000000000 --- a/nixos/hardware/dell/xps/15-7590/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, ... }: -# Earlier font-size setup. -# Virtual console options were renamed in 20.03; use the right option depending -# on the OS version; keep this here at least until 20.03 is stable. -lib.recursiveUpdate -(if lib.versionAtLeast (lib.versions.majorMinor lib.version) "20.03" then { - console.earlySetup = true; -} else { - boot.earlyVconsoleSetup = true; -}) { - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ../../../common/pc/ssd - ]; - - # Set to true for just the first run, then disable it. - # boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; - - # Load GPU drivers. - # hardware.bumblebee.enable = lib.mkDefault true; - - # High DPI for X users. 175 "looks reasonable" but I didn't do the actual DPI - # calculation. - # services.xserver.dpi = lib.mkDefault 175; - - # Earlier font-size setup - console.earlySetup = true; - - # Prevent small EFI partiion from filling up - boot.loader.grub.configurationLimit = 10; - - # The 48.ucode causes the Killer wifi card to crash. - # The iwlfwifi-cc-a0-46.ucode works perfectly - nixpkgs.overlays = [ - (self: super: { - firmwareLinuxNonfree = super.firmwareLinuxNonfree.overrideAttrs (old: { - src = super.fetchgit { - url = - "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "bf13a71b18af229b4c900b321ef1f8443028ded8"; - sha256 = "1dcaqdqyffxiadx420pg20157wqidz0c0ca5mrgyfxgrbh6a4mdj"; - }; - postInstall = '' - rm $out/lib/firmware/iwlwifi-cc-a0-48.ucode - ''; - outputHash = "0dq48i1cr8f0qx3nyq50l9w9915vhgpwmwiw3b4yhisbc3afyay4"; - }); - }) - ]; -} diff --git a/nixos/hardware/dell/xps/15-9550/README.wiki b/nixos/hardware/dell/xps/15-9550/README.wiki deleted file mode 100644 index c0e9158a883e..000000000000 --- a/nixos/hardware/dell/xps/15-9550/README.wiki +++ /dev/null @@ -1,52 +0,0 @@ -= Dell XPS 15 9550 = - -Most of this I presume also applies to the XPS 13 1530, the 13" variant. - -== Tested Hardware == - -* CPU: Intel(R) Core(TM) i7-6700HQ CPU @ 2.60GHz -* RAM: 16 GB -* HDD: 512 GiB SSD -* Screen: 15" 4k (3840✕2160) -* Graphics: NVIDIA Corporation GM107M, with Intel Graphics too. -* Input: Touchscreen and trackpad. - - -== Firmware Configuration == - -Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. - -=== Before installation === - -These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. - -* ''Disable Secure Boot (but keep UEFI Boot).'' Thakfully doing so is as easy as changing any other simple setting. - -* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) - - -=== After installation === - -* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. - -=== Optional === - -* ''Disable C-States.'' This is a processor idling thing. It seems to cause random crashes (Blank screen, no normal panic debug dump). Unfortunately, without it, the computer cannot be suspended. On the other hand, it doesn't seem to affect acpi's estimation of battery life when the computer is running with minimal load, but I haven't tested battery life in practice. I list it as optional as there's a tradeoff, and the crashes are rare enough one can probably get through installation just fine. - -* ''Update BIOS.'' According to Reddit, this helps with battery life. - -* ''Update Intel's Thunderbolt firmware.'' Without this, the Thunderbolt port will only work as power source, and not transfer data. - -=== Troubleshooting === - -==== rcu_sched freezing problems ==== - -After a recent update my machine became unstable. X couldn't start and even running `lspci` would lock the machine. I'm not sure what the root cause was, but I found the fix here: https://wiki.archlinux.org/index.php/Dell_XPS_15_9560#Troubleshooting - -TL;DR I added this line: - -``` -boot.kernelParams = [ "acpi_rev_override=1" "pcie_aspm=off" "nouveau.modeset=0" ]; -``` - -Some more detail about the problem can be found here: https://bbs.archlinux.org/viewtopic.php?id=223056 diff --git a/nixos/hardware/dell/xps/15-9550/default.nix b/nixos/hardware/dell/xps/15-9550/default.nix deleted file mode 100644 index 9677972a6b70..000000000000 --- a/nixos/hardware/dell/xps/15-9550/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ]; - - # TODO: boot loader - boot.loader.systemd-boot.enable = lib.mkDefault true; - boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; - - # This will save you money and possibly your life! - services.thermald.enable = true; - - # To just use Intel integrated graphics with Intel's open source driver - # hardware.nvidiaOptimus.disable = true; -} diff --git a/nixos/hardware/dell/xps/15-9560/README.wiki b/nixos/hardware/dell/xps/15-9560/README.wiki deleted file mode 100644 index faf4ced8bec2..000000000000 --- a/nixos/hardware/dell/xps/15-9560/README.wiki +++ /dev/null @@ -1,54 +0,0 @@ -= Dell XPS 15 9560 = - -== Tested Hardware == - -* CPU: Intel(R) Core(TM) i7-7700HQ CPU @ 2.80GHz -* RAM: 16 GB -* HDD: 512 GiB SSD -* Screen: 15.6" FHD(1920x1080) InfinityEdge -* Graphics: NVIDIA Corporation GTX1050 4GB GDDR5, with Intel Graphics too. -* Input: trackpad - - -== Firmware Configuration == - -Not much tweaking of NixOS itself was needed. But we currently cannot automate the firmware setup, so this must be done by hand. - -=== Before installation === - -These settings are needed both for booting the final install, and installer itself. Therefore, they must be done first. - -* ''Disable Secure Boot (but keep UEFI Boot).'' Thakfully doing so is as easy as changing any other simple setting. - -* ''Disable Intel hardware RAID and use AHCI instead.'' Intel doesn't seem to provide a working linux driver for this. (If you just have SSD it's pointless and just slows things down needlessly anyways.) - - -=== After installation === - -* ''Add systemd-boot to UEFI boot list.'' The (uneditable anyways) settings mapping drive UUIDs to HD* work fine. - -=== Optional === - -* ''Disable C-States.'' This is a processor idling thing. It seems to cause random crashes (Blank screen, no normal panic debug dump). Unfortunately, without it, the computer cannot be suspended. On the other hand, it doesn't seem to affect acpi's estimation of battery life when the computer is running with minimal load, but I haven't tested battery life in practice. I list it as optional as there's a tradeoff, and the crashes are rare enough one can probably get through installation just fine. - -* ''Update BIOS.'' According to Reddit, this helps with battery life. - -* ''Update Intel's Thunderbolt firmware.'' Without this, the Thunderbolt port will only work as power source, and not transfer data. - -=== Troubleshooting === - -==== rcu_sched freezing problems ==== - -After a recent update my machine became unstable. X couldn't start and even running `lspci` would lock the machine. I'm not sure what the root cause was, but I found the fix here: https://wiki.archlinux.org/index.php/Dell_XPS_15_9560#Troubleshooting - -TL;DR I added this line: - I am leaving these params here, I haven't test these so use on your own risk. - I am using different method to disable nvidia. - ("acpi_rev_override=1" param is save and I have been using it for a while now, - no crashes.) - -``` -boot.kernelParams = [ "acpi_rev_override=1" "pcie_aspm=off" "nouveau.modeset=0" ]; -``` - -Some more detail about the problem can be found here: https://bbs.archlinux.org/viewtopic.php?id=223056 diff --git a/nixos/hardware/dell/xps/15-9560/default.nix b/nixos/hardware/dell/xps/15-9560/default.nix deleted file mode 100644 index e7ec6c29d53e..000000000000 --- a/nixos/hardware/dell/xps/15-9560/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ./xps-common.nix - ]; - - # This configuration makes intel default and optionaly applications could run nvidia with optirun. - # To Optimize for your use case import intel or nvidia only configuration instead - # xps-9560/intel - # or - # xps-9560/nvidia - - - ##### bumblebee working, needs reboot to take affect and to use it run: optirun "" - services.xserver.videoDrivers = lib.mkDefault [ "intel" "nvidia" ]; - boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "bbswitch" ]; - boot.extraModulePackages = lib.mkDefault [ pkgs.linuxPackages.nvidia_x11 ]; - hardware.bumblebee.enable = lib.mkDefault true; - hardware.bumblebee.pmMethod = lib.mkDefault "none"; - -} diff --git a/nixos/hardware/dell/xps/15-9560/intel/default.nix b/nixos/hardware/dell/xps/15-9560/intel/default.nix deleted file mode 100644 index f20379786ddb..000000000000 --- a/nixos/hardware/dell/xps/15-9560/intel/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../../common/cpu/intel - ../../../../common/pc/laptop - ../xps-common.nix - ]; - - - # This runs only Intel and nvidia does not drain power. - - ##### disable nvidia, very nice battery life. - hardware.nvidiaOptimus.disable = lib.mkDefault true; - boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" ]; - services.xserver.videoDrivers = lib.mkDefault [ "intel" ]; - -} diff --git a/nixos/hardware/dell/xps/15-9560/nvidia/default.nix b/nixos/hardware/dell/xps/15-9560/nvidia/default.nix deleted file mode 100644 index 2cd5d1b158dc..000000000000 --- a/nixos/hardware/dell/xps/15-9560/nvidia/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ../../../../common/cpu/intel - ../../../../common/pc/laptop - ../xps-common.nix - ]; - - - # This runs only nvidia, great for games or heavy use of render applications - - ##### disable intel, run nvidia only and as default - services.xserver.videoDrivers = lib.mkDefault ["nvidia"]; - hardware.nvidia.modesetting.enable = lib.mkDefault true; - hardware.nvidia.optimus_prime.enable = lib.mkDefault true; - hardware.nvidia.optimus_prime.nvidiaBusId = lib.mkDefault "PCI:1:0:0"; - hardware.nvidia.optimus_prime.intelBusId = lib.mkDefault "PCI:0:2:0"; - -} diff --git a/nixos/hardware/dell/xps/15-9560/xps-common.nix b/nixos/hardware/dell/xps/15-9560/xps-common.nix deleted file mode 100644 index 62aae078545d..000000000000 --- a/nixos/hardware/dell/xps/15-9560/xps-common.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, ... }: - -{ - - # Boot loader - boot.loader.systemd-boot.enable = lib.mkDefault true; - boot.loader.efi.canTouchEfiVariables = lib.mkDefault true; - boot.kernelParams = lib.mkDefault [ "acpi_rev_override" ]; - - # This will save you money and possibly your life! - services.thermald.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/google/pixelbook/default.nix b/nixos/hardware/google/pixelbook/default.nix deleted file mode 100644 index 1ea4c7afdbdd..000000000000 --- a/nixos/hardware/google/pixelbook/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - imports = [ - ../../common/pc/laptop - ../../common/pc/laptop/ssd - ../../common/cpu/intel/kaby-lake - ]; -} diff --git a/nixos/hardware/inversepath/usbarmory/README.txt b/nixos/hardware/inversepath/usbarmory/README.txt deleted file mode 100644 index 31922a8d7519..000000000000 --- a/nixos/hardware/inversepath/usbarmory/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -USB Armory network interface support - -- rename the Armory USB network interface -- set Armory inteface ip to 10.0.0.2/24 -- enable NAT and forward Armory interface -- add the name 'armory' to /etc/hosts diff --git a/nixos/hardware/inversepath/usbarmory/default.nix b/nixos/hardware/inversepath/usbarmory/default.nix deleted file mode 100644 index 5c329f8286d3..000000000000 --- a/nixos/hardware/inversepath/usbarmory/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot = { - extraModprobeConfig = lib.mkDefault '' - options g_ether use_eem=0 dev_addr=1a:55:89:a2:69:41 host_addr=1a:55:89:a2:69:42 - ''; - - kernelModules = [ "ledtrig_heartbeat" "ci_hdrc_imx" "g_ether" ]; - kernelPackages = lib.mkDefault pkgs.linuxPackages_usbarmory; - kernelParams = [ "console=ttymxc0,115200" ]; - - loader.generic-extlinux-compatible.enable = lib.mkDefault true; - }; - - networking = { - defaultGateway = "172.16.0.1"; - firewall.enable = lib.mkDefault false; - hostName = "usbarmory"; - - interfaces.usb0.ip4 = [ - { address = "172.16.0.2"; prefixLength = 24; } - ]; - - nameservers = [ "8.8.8.8" ]; - }; - - nix = { - binaryCaches = [ "http://nixos-arm.dezgeg.me/channel" ]; - binaryCachePublicKeys = [ "nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%" ]; - }; - - nixpkgs.overlays = [(final: previous: { - linuxPackages_usbarmory = final.recurseIntoAttrs - (final.linuxPackagesFor (import ./kernel.nix { - inherit (final) stdenv buildLinux fetchurl; - })); - })]; - - sound.enable = lib.mkDefault false; - - services = { - openssh.enable = lib.mkDefault true; - openssh.permitRootLogin = lib.mkDefault "without-password"; - }; -} diff --git a/nixos/hardware/inversepath/usbarmory/host.nix b/nixos/hardware/inversepath/usbarmory/host.nix deleted file mode 100644 index 42cef490c6f8..000000000000 --- a/nixos/hardware/inversepath/usbarmory/host.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ dev ? "armory0" }: - -{ - services.udev.extraRules = '' - SUBSYSTEM=="net", ACTION=="add", ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a2", NAME="${staticDevName}" - ''; - - networking = { - interfaces."${staticDevName}".ip4 = [{ - address = "10.0.0.2"; - prefixLength = 24; - }]; - nat = { - enable = true; - internalInterfaces = [ dev ]; - }; - extraHosts = "10.0.0.1 armory"; - }; -} diff --git a/nixos/hardware/inversepath/usbarmory/kernel.config b/nixos/hardware/inversepath/usbarmory/kernel.config deleted file mode 100644 index e2fa29737937..000000000000 --- a/nixos/hardware/inversepath/usbarmory/kernel.config +++ /dev/null @@ -1,995 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_GENERIC_BUG=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y -CONFIG_DMIID=y -CONFIG_BROKEN_ON_SMP=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_KERNEL_GZIP=y -CONFIG_DEFAULT_HOSTNAME="usbarmory" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_FHANDLE=y -CONFIG_USELIB=y -CONFIG_AUDIT=y -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_SPARSE_IRQ=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_PREEMPT_RCU=y -CONFIG_SRCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_BUILD_BIN2C=y -CONFIG_IKCONFIG=m -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_CGROUPS=y -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_HAVE_UID16=y -CONFIG_BPF=y -CONFIG_EXPERT=y -CONFIG_UID16=y -CONFIG_MULTIUSER=y -CONFIG_SYSFS_SYSCALL=y -CONFIG_SYSCTL_SYSCALL=y -CONFIG_KALLSYMS=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_ADVISE_SYSCALLS=y -CONFIG_MEMBARRIER=y -CONFIG_EMBEDDED=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_PERF_USE_VMALLOC=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_COMPAT_BRK=y -CONFIG_SLUB=y -CONFIG_HAVE_OPROFILE=y -CONFIG_JUMP_LABEL=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_ATTRS=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_CC_STACKPROTECTOR_NONE=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OLD_SIGACTION=y -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y -CONFIG_BLOCK=y -CONFIG_LBDAF=y -CONFIG_BLK_CMDLINE_PARSER=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MSDOS_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_EFI_STUB=y -CONFIG_CMDLINE_PARTITION=y -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_DEADLINE=m -CONFIG_IOSCHED_CFQ=m -CONFIG_DEFAULT_NOOP=y -CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_ASN1=m -CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_FREEZER=y -CONFIG_MMU=y -CONFIG_ARCH_MULTIPLATFORM=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_MXC=y -CONFIG_MXC_TZIC=y -CONFIG_HAVE_IMX_SRC=y -CONFIG_SOC_IMX5=y -CONFIG_SOC_IMX53=y -CONFIG_CPU_V7=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_CACHE_V7=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_HAS_ASID=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -CONFIG_ARM_THUMB=y -CONFIG_ARM_VIRT_EXT=y -CONFIG_KUSER_HELPERS=y -CONFIG_OUTER_CACHE=y -CONFIG_OUTER_CACHE_SYNC=y -CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_CACHE_L2X0=y -CONFIG_ARM_L1_CACHE_SHIFT_6=y -CONFIG_ARM_L1_CACHE_SHIFT=6 -CONFIG_ARM_DMA_MEM_BUFFERABLE=y -CONFIG_ARM_HEAVY_MB=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_HAVE_SMP=y -CONFIG_VMSPLIT_2G=y -CONFIG_PAGE_OFFSET=0x80000000 -CONFIG_ARCH_NR_GPIO=0 -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_HZ_FIXED=0 -CONFIG_HZ_100=y -CONFIG_HZ=100 -CONFIG_SCHED_HRTICK=y -CONFIG_AEABI=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_CPU_SW_DOMAIN_PAN=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_NO_BOOTMEM=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_ZONE_DMA_FLAG=0 -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_NEED_PER_CPU_KM=y -CONFIG_CLEANCACHE=y -CONFIG_ZPOOL=m -CONFIG_ZBUD=m -CONFIG_ZSMALLOC=m -CONFIG_FORCE_MAX_ZONEORDER=11 -CONFIG_ALIGNMENT_TRAP=y -CONFIG_SECCOMP=y -CONFIG_SWIOTLB=y -CONFIG_IOMMU_HELPER=y -CONFIG_USE_OF=y -CONFIG_ATAGS=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mmcblk0p1 rw rootfstype=ext4 ip=off" -CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_AUTO_ZRELADDR=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_GOV_COMMON=y -CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPUFREQ_DT=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_NEON=y -CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_SCRIPT=y -CONFIG_COREDUMP=y -CONFIG_HIBERNATE_CALLBACKS=y -CONFIG_HIBERNATION=y -CONFIG_PM_STD_PARTITION="" -CONFIG_PM_SLEEP=y -CONFIG_PM=y -CONFIG_PM_OPP=y -CONFIG_PM_CLK=y -CONFIG_CPU_PM=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARM_CPU_SUSPEND=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_NET=y -CONFIG_NET_INGRESS=y -CONFIG_PACKET=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_ALGO=m -CONFIG_XFRM_USER=m -CONFIG_XFRM_SUB_POLICY=y -CONFIG_XFRM_MIGRATE=y -CONFIG_XFRM_STATISTICS=y -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_SYN_COOKIES=y -CONFIG_NET_IPVTI=m -CONFIG_NET_UDP_TUNNEL=m -CONFIG_NET_FOU=m -CONFIG_NET_FOU_IP_TUNNELS=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_DIAG=y -CONFIG_INET_TCP_DIAG=y -CONFIG_INET_UDP_DIAG=m -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -CONFIG_DEFAULT_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_VTI=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_SIT_6RD=y -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_GRE=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=m -CONFIG_NETFILTER_INGRESS=y -CONFIG_NETFILTER_NETLINK=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_LOG_COMMON=m -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_BROADCAST=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_SNMP=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NF_CT_NETLINK_TIMEOUT=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_SIP=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_REDIRECT=m -CONFIG_NETFILTER_SYNPROXY=m -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_NAT=m -CONFIG_NETFILTER_XT_TARGET_NETMAP=m -CONFIG_NETFILTER_XT_TARGET_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_BPF=m -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -CONFIG_NETFILTER_XT_MATCH_ECN=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_PROC_COMPAT=y -CONFIG_NF_DUP_IPV4=m -CONFIG_NF_LOG_ARP=m -CONFIG_NF_LOG_IPV4=m -CONFIG_NF_REJECT_IPV4=m -CONFIG_NF_NAT_IPV4=m -CONFIG_NF_NAT_MASQUERADE_IPV4=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_DUP_IPV6=m -CONFIG_NF_REJECT_IPV6=m -CONFIG_NF_LOG_IPV6=m -CONFIG_NF_NAT_IPV6=m -CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_NAT=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m -CONFIG_L2TP=m -CONFIG_STP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_HAVE_NET_DSA=y -CONFIG_VLAN_8021Q=m -CONFIG_LLC=m -CONFIG_NET_SCHED=y -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_CLS=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_CGROUP=m -CONFIG_NET_CLS_BPF=m -CONFIG_NET_SCH_FIFO=y -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -CONFIG_BPF_JIT=y -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_CFG80211=m -CONFIG_CFG80211_DEFAULT_PS=y -CONFIG_CFG80211_CRDA_SUPPORT=y -CONFIG_CFG80211_WEXT=y -CONFIG_MAC80211=m -CONFIG_MAC80211_HAS_RC=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_MINSTREL_HT=y -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" -CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -CONFIG_HAVE_BPF_JIT=y -CONFIG_UEVENT_HELPER=y -CONFIG_UEVENT_HELPER_PATH="" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y -CONFIG_FW_LOADER=m -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" -CONFIG_SOC_BUS=y -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=m -CONFIG_REGMAP_MMIO=m -CONFIG_MTD=m -CONFIG_MTD_OF_PARTS=m -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -CONFIG_MTD_M25P80=m -CONFIG_MTD_BLOCK2MTD=m -CONFIG_MTD_SPI_NOR=m -CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y -CONFIG_DTC=y -CONFIG_OF=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_IRQ=y -CONFIG_OF_NET=y -CONFIG_OF_MTD=y -CONFIG_OF_RESERVED_MEM=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -CONFIG_SRAM=y -CONFIG_EEPROM_93CX6=m -CONFIG_SCSI_MOD=m -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y -CONFIG_BLK_DEV_SD=m -CONFIG_SCSI_LOWLEVEL=y -CONFIG_MD=y -CONFIG_BLK_DEV_DM_BUILTIN=y -CONFIG_BLK_DEV_DM=y -CONFIG_DM_BUFIO=y -CONFIG_DM_CRYPT=y -CONFIG_DM_VERITY=y -CONFIG_NETDEVICES=y -CONFIG_NET_CORE=y -CONFIG_DUMMY=m -CONFIG_VXLAN=m -CONFIG_TUN=m -CONFIG_VETH=m -CONFIG_PPP=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_FILTER=y -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOL2TP=m -CONFIG_SLHC=m -CONFIG_USB_NET_DRIVERS=m -CONFIG_WLAN=y -CONFIG_RTL8187=m -CONFIG_RT2X00=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2800USB=m -CONFIG_RT2800USB_RT33XX=y -CONFIG_RT2800USB_RT35XX=y -CONFIG_RT2800USB_RT3573=y -CONFIG_RT2800USB_RT53XX=y -CONFIG_RT2800USB_RT55XX=y -CONFIG_RT2800USB_UNKNOWN=y -CONFIG_RT2800_LIB=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_LEDS=y -CONFIG_RT2X00_DEBUG=y -CONFIG_RTL_CARDS=m -CONFIG_RTL8192CU=m -CONFIG_RTLWIFI=m -CONFIG_RTLWIFI_USB=m -CONFIG_RTLWIFI_DEBUG=y -CONFIG_RTL8192C_COMMON=m -CONFIG_RTL8XXXU=m -CONFIG_INPUT=y -CONFIG_INPUT_LEDS=m -CONFIG_INPUT_MOUSEDEV=m -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_FOCALTECH=y -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_SYNAPTICS_USB=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_PROPERTIES=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_USB_E2I=y -CONFIG_SERIO=y -CONFIG_SERIO_SERPORT=y -CONFIG_SERIO_LIBPS2=y -CONFIG_TTY=y -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y -CONFIG_HW_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_UNIX98_PTYS=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 -CONFIG_DEVMEM=y -CONFIG_DEVKMEM=y -CONFIG_SERIAL_EARLYCON=y -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_HW_RANDOM=m -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_IMX=m -CONFIG_SPI=y -CONFIG_SPI_DEBUG=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_BITBANG=m -CONFIG_SPI_IMX=m -CONFIG_SPI_SPIDEV=m -CONFIG_PPS=y -CONFIG_PINCTRL=y -CONFIG_PINMUX=y -CONFIG_PINCONF=y -CONFIG_PINCTRL_IMX=y -CONFIG_PINCTRL_IMX53=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_ARCH_REQUIRE_GPIOLIB=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_DEVRES=y -CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=y -CONFIG_GPIO_GENERIC_PLATFORM=y -CONFIG_GPIO_MXC=y -CONFIG_POWER_SUPPLY=y -CONFIG_POWER_AVS=y -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -CONFIG_SOFT_WATCHDOG=m -CONFIG_GPIO_WATCHDOG=m -CONFIG_IMX2_WDT=m -CONFIG_SSB_POSSIBLE=y -CONFIG_BCMA_POSSIBLE=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_LTC3589=m -CONFIG_DUMMY_CONSOLE=y -CONFIG_HID=y -CONFIG_HID_GENERIC=m -CONFIG_USB_HID=m -CONFIG_USB_HIDDEV=y -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_COMMON=m -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=m -CONFIG_USB_DEFAULT_PERSIST=y -CONFIG_USB_OTG=y -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_EHCI_TT_NEWSCHED=y -CONFIG_USB_STORAGE=m -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_OF=m -CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y -CONFIG_USB_CHIPIDEA_DEBUG=y -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=y -CONFIG_USB_GADGET=m -CONFIG_USB_GADGET_DEBUG_FS=y -CONFIG_USB_GADGET_VBUS_DRAW=500 -CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 -CONFIG_USB_LIBCOMPOSITE=m -CONFIG_USB_F_ACM=m -CONFIG_USB_F_SS_LB=m -CONFIG_USB_U_SERIAL=m -CONFIG_USB_U_ETHER=m -CONFIG_USB_F_SERIAL=m -CONFIG_USB_F_OBEX=m -CONFIG_USB_F_NCM=m -CONFIG_USB_F_ECM=m -CONFIG_USB_F_EEM=m -CONFIG_USB_F_SUBSET=m -CONFIG_USB_F_RNDIS=m -CONFIG_USB_F_MASS_STORAGE=m -CONFIG_USB_F_FS=m -CONFIG_USB_F_HID=m -CONFIG_USB_F_PRINTER=m -CONFIG_USB_CONFIGFS=m -CONFIG_USB_CONFIGFS_SERIAL=y -CONFIG_USB_CONFIGFS_ACM=y -CONFIG_USB_CONFIGFS_OBEX=y -CONFIG_USB_CONFIGFS_NCM=y -CONFIG_USB_CONFIGFS_ECM=y -CONFIG_USB_CONFIGFS_ECM_SUBSET=y -CONFIG_USB_CONFIGFS_RNDIS=y -CONFIG_USB_CONFIGFS_EEM=y -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -CONFIG_USB_CONFIGFS_F_LB_SS=y -CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_USB_CONFIGFS_F_HID=y -CONFIG_USB_CONFIGFS_F_PRINTER=y -CONFIG_USB_ZERO=m -CONFIG_USB_ETH=m -CONFIG_USB_ETH_RNDIS=y -CONFIG_USB_ETH_EEM=y -CONFIG_USB_G_NCM=m -CONFIG_USB_GADGETFS=m -CONFIG_USB_FUNCTIONFS=m -CONFIG_USB_FUNCTIONFS_ETH=y -CONFIG_USB_FUNCTIONFS_RNDIS=y -CONFIG_USB_FUNCTIONFS_GENERIC=y -CONFIG_USB_MASS_STORAGE=m -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_PRINTER=m -CONFIG_USB_CDC_COMPOSITE=m -CONFIG_USB_G_ACM_MS=m -CONFIG_USB_G_MULTI=m -CONFIG_USB_G_MULTI_RNDIS=y -CONFIG_USB_G_MULTI_CDC=y -CONFIG_USB_G_HID=m -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=8 -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_IO_ACCESSORS=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SDHCI_ESDHC_IMX=y -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_ONESHOT=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_CPU=y -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m -CONFIG_LEDS_TRIGGER_TRANSIENT=m -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -CONFIG_RTC_SYSTOHC=y -CONFIG_RTC_SYSTOHC_DEVICE="rtc0" -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_RTC_DRV_IMXDI=y -CONFIG_RTC_DRV_MXC=y -CONFIG_DMADEVICES=y -CONFIG_DMA_ENGINE=y -CONFIG_DMA_OF=y -CONFIG_IMX_SDMA=m -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y -CONFIG_CLKSRC_OF=y -CONFIG_CLKSRC_PROBE=y -CONFIG_CLKSRC_MMIO=y -CONFIG_CLKSRC_IMX_GPT=y -CONFIG_IOMMU_SUPPORT=y -CONFIG_EXTCON=m -CONFIG_IRQCHIP=y -CONFIG_ARCH_HAS_RESET_CONTROLLER=y -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_USE_FOR_EXT2=y -CONFIG_JBD2=y -CONFIG_FS_MBCACHE=y -CONFIG_EXPORTFS=y -CONFIG_FILE_LOCKING=y -CONFIG_FSNOTIFY=y -CONFIG_DNOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_AUTOFS4_FS=y -CONFIG_FUSE_FS=m -CONFIG_OVERLAY_FS=y -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -CONFIG_NTFS_RW=y -CONFIG_PROC_FS=y -CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y -CONFIG_KERNFS=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -CONFIG_TMPFS_POSIX_ACL=y -CONFIG_TMPFS_XATTR=y -CONFIG_CONFIGFS_FS=y -CONFIG_MISC_FILESYSTEMS=y -CONFIG_ECRYPT_FS=m -CONFIG_ECRYPT_FS_MESSAGING=y -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_RTIME=y -CONFIG_SQUASHFS=y -CONFIG_SQUASHFS_FILE_DIRECT=y -CONFIG_SQUASHFS_DECOMP_SINGLE=y -CONFIG_SQUASHFS_ZLIB=y -CONFIG_SQUASHFS_LZ4=y -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V2=m -CONFIG_NFS_V3=m -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -CONFIG_GRACE_PERIOD=m -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_CIFS=m -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_ASCII=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 -CONFIG_ENABLE_WARN_DEPRECATED=y -CONFIG_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 -CONFIG_DEBUG_FS=y -CONFIG_SECTION_MISMATCH_WARN_ONLY=y -CONFIG_DEBUG_KERNEL=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_LOCKUP_DETECTOR=y -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y -CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=0 -CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1 -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=5 -CONFIG_SCHED_DEBUG=y -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACING_SUPPORT=y -CONFIG_LKDTM=m -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_STRICT_DEVMEM=y -CONFIG_ARM_UNWIND=y -CONFIG_DEBUG_IMX_UART_PORT=1 -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_KEYS=y -CONFIG_ENCRYPTED_KEYS=m -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -CONFIG_INTEGRITY=y -CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_DEFAULT_SECURITY="" -CONFIG_CRYPTO=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=m -CONFIG_CRYPTO_PCOMP=m -CONFIG_CRYPTO_PCOMP2=y -CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_USER=m -CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_ECHAINIV=m -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_XTS=y -CONFIG_CRYPTO_CMAC=m -CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_DRBG_MENU=m -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_HASH=y -CONFIG_CRYPTO_DRBG_CTR=y -CONFIG_CRYPTO_DRBG=m -CONFIG_CRYPTO_JITTERENTROPY=m -CONFIG_CRYPTO_USER_API=m -CONFIG_CRYPTO_USER_API_HASH=m -CONFIG_CRYPTO_USER_API_SKCIPHER=m -CONFIG_CRYPTO_USER_API_RNG=m -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_SAHARA=y -CONFIG_ASYMMETRIC_KEY_TYPE=m -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m -CONFIG_PUBLIC_KEY_ALGO_RSA=m -CONFIG_X509_CERTIFICATE_PARSER=m -CONFIG_PKCS7_MESSAGE_PARSER=m -CONFIG_BITREVERSE=y -CONFIG_HAVE_ARCH_BITREVERSE=y -CONFIG_RATIONAL=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_NET_UTILS=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_IO=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=y -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=y -CONFIG_CRC32_SLICEBY8=y -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=y -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_LZ4_DECOMPRESS=y -CONFIG_DECOMPRESS_GZIP=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAS_DMA=y -CONFIG_DQL=y -CONFIG_NLATTR=y -CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y -CONFIG_CLZ_TAB=y -CONFIG_MPILIB=m -CONFIG_LIBFDT=y -CONFIG_OID_REGISTRY=m -CONFIG_ARCH_HAS_SG_CHAIN=y diff --git a/nixos/hardware/inversepath/usbarmory/kernel.nix b/nixos/hardware/inversepath/usbarmory/kernel.nix deleted file mode 100644 index 4cf6fd7fdb8a..000000000000 --- a/nixos/hardware/inversepath/usbarmory/kernel.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, buildLinux, fetchurl }: - -buildLinux { - inherit stdenv; - version = "4.4.0"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz"; - sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"; - }; - - configfile = ./kernel.config; - - kernelPatches = [{ - patch = ./usbarmory-dts.patch; - name = "usbarmory-dts"; - }]; - - allowImportFromDerivation = true; -} diff --git a/nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch b/nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch deleted file mode 100644 index e29c6dd331db..000000000000 --- a/nixos/hardware/inversepath/usbarmory/usbarmory-dts.patch +++ /dev/null @@ -1,418 +0,0 @@ -diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-common.dtsi linux-4.4/arch/arm/boot/dts/imx53-usbarmory-common.dtsi ---- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-common.dtsi 1969-12-31 18:00:00.000000000 -0600 -+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-common.dtsi 2016-02-04 08:31:38.730794858 -0600 -@@ -0,0 +1,241 @@ -+/* -+ * USB armory MkI device tree include file -+ * https://inversepath.com/usbarmory -+ * -+ * Copyright (C) 2015, Inverse Path -+ * Andrej Rosano -+ * -+ * Licensed under GPLv2 -+ */ -+ -+#include "imx53.dtsi" -+ -+/ { -+ model = "Inverse Path USB armory"; -+ compatible = "inversepath,imx53-usbarmory", "fsl,imx53"; -+}; -+ -+/ { -+ chosen { -+ stdout-path = &uart1; -+ }; -+ -+ memory { -+ reg = <0x70000000 0x20000000>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&led_pin_gpio4_27>; -+ -+ user { -+ label = "LED"; -+ gpios = <&gpio4 27 0>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+ -+ soc { -+ aips@60000000 { -+ sahara: crypto@63ff8000 { -+ compatible = "fsl,imx53-sahara"; -+ reg = <0x63ff8000 0x4000>; -+ interrupts = <19 20>; -+ clocks = <&clks IMX5_CLK_SAHARA_IPG_GATE>, -+ <&clks IMX5_CLK_SAHARA_IPG_GATE>; -+ clock-names = "ipg", "ahb"; -+ }; -+ }; -+ }; -+}; -+ -+&cpu0 { -+ device_type = "cpu"; -+ compatible = "arm,cortex-a8"; -+ reg = <0x0>; -+ clocks = <&clks IMX5_CLK_ARM>; -+ clock-latency = <61036>; -+ voltage-tolerance = <5>; -+ operating-points = < -+ /* kHz */ -+ 166666 850000 -+ 400000 900000 -+ 800000 1050000 -+ >; -+}; -+ -+&esdhc1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_esdhc1>; -+ status = "okay"; -+}; -+ -+&iomuxc { -+ pinctrl-names = "default"; -+ -+ imx53-usbarmory { -+ led_pin_gpio4_27: led_gpio4_27@0 { -+ fsl,pins = < -+ MX53_PAD_DISP0_DAT6__GPIO4_27 0x80000000 -+ >; -+ }; -+ -+ pinctrl_esdhc1: esdhc1grp { -+ fsl,pins = < -+ MX53_PAD_SD1_DATA0__ESDHC1_DAT0 0x1d5 -+ MX53_PAD_SD1_DATA1__ESDHC1_DAT1 0x1d5 -+ MX53_PAD_SD1_DATA2__ESDHC1_DAT2 0x1d5 -+ MX53_PAD_SD1_DATA3__ESDHC1_DAT3 0x1d5 -+ MX53_PAD_SD1_CMD__ESDHC1_CMD 0x1d5 -+ MX53_PAD_SD1_CLK__ESDHC1_CLK 0x1d5 -+ >; -+ }; -+ -+ pinctrl_i2c1_pmic: i2c1grp_pmic { -+ fsl,pins = < -+ MX53_PAD_EIM_D21__I2C1_SCL 0xc0000000 -+ MX53_PAD_EIM_D28__I2C1_SDA 0xc0000000 -+ >; -+ }; -+ -+ /* -+ UART mode pin header configration: -+ pin number: 1 2 3 4 5 6 7 -+ function: GND 5V ? ? TX RX ? -+ */ -+ pinctrl_uart1: uart1grp { -+ fsl,pins = < -+ MX53_PAD_CSI0_DAT10__UART1_TXD_MUX 0x1e4 -+ MX53_PAD_CSI0_DAT11__UART1_RXD_MUX 0x1e4 -+ >; -+ }; -+ -+ /* -+ GPIO mode pin header configuration: -+ 1 2 3 4 5 6 7 -+ GND 5V GPIO5[26] GPIO5[27] GPIO5[28] GPIO5[29] GPIO5[30] -+ */ -+ pinctrl_gpio5: gpio5grp { -+ fsl,pins = < -+ MX53_PAD_CSI0_DAT8__GPIO5_26 0xc0 -+ MX53_PAD_CSI0_DAT9__GPIO5_27 0xc0 -+ MX53_PAD_CSI0_DAT10__GPIO5_28 0xc0 -+ MX53_PAD_CSI0_DAT11__GPIO5_29 0xc0 -+ MX53_PAD_CSI0_DAT12__GPIO5_30 0xc0 -+ >; -+ }; -+ -+ /* -+ SPI mode pin header configuration: -+ 1 2 3 4 5 6 7 -+ GND 5V SCLK MOSI MISO /SS0 /SS1 -+ */ -+ pinctrl_ecspi2: ecspi2grp { -+ fsl,pins = < -+ MX53_PAD_CSI0_DAT8__ECSPI2_SCLK 0x80000000 -+ MX53_PAD_CSI0_DAT9__ECSPI2_MOSI 0x80000000 -+ MX53_PAD_CSI0_DAT10__ECSPI2_MISO 0x80000000 -+ MX53_PAD_CSI0_DAT11__GPIO5_29 0x80000000 -+ MX53_PAD_CSI0_DAT12__GPIO5_30 0x80000000 -+ >; -+ }; -+ -+ /* -+ I2C mode pin header configuration: -+ 1 2 3 4 5 6 7 -+ GND 5V SDA SCL GPIO5[28] GPIO5[29] GPIO5[30] -+ */ -+ pinctrl_i2c1_pinheader: i2c1grp_pinheader { -+ fsl,pins = < -+ MX53_PAD_CSI0_DAT8__I2C1_SDA 0xc0000000 -+ MX53_PAD_CSI0_DAT9__I2C1_SCL 0xc0000000 -+ MX53_PAD_CSI0_DAT10__GPIO5_28 0x80000000 -+ MX53_PAD_CSI0_DAT11__GPIO5_29 0x80000000 -+ MX53_PAD_CSI0_DAT12__GPIO5_30 0x80000000 -+ >; -+ }; -+ }; -+}; -+ -+&uart1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart1>; -+ status = "okay"; -+}; -+ -+&vpu { -+ status = "okay"; -+}; -+ -+&i2c1 { -+ pinctrl-0 = <&pinctrl_i2c1_pmic>; -+ status = "okay"; -+ ltc3589: pmic@34 { -+ compatible = "lltc,ltc3589-2"; -+ reg = <0x34>; -+ regulators { -+ sw1_reg: sw1 { -+ regulator-min-microvolt = <591930>; -+ regulator-max-microvolt = <1224671>; -+ lltc,fb-voltage-divider = <100000 158000>; -+ regulator-ramp-delay = <7000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ sw2_reg: sw2 { -+ regulator-min-microvolt = <704123>; -+ regulator-max-microvolt = <1456803>; -+ lltc,fb-voltage-divider = <180000 191000>; -+ regulator-ramp-delay = <7000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ sw3_reg: sw3 { -+ regulator-min-microvolt = <1341250>; -+ regulator-max-microvolt = <2775000>; -+ lltc,fb-voltage-divider = <270000 100000>; -+ regulator-ramp-delay = <7000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ bb_out_reg: bb-out { -+ regulator-min-microvolt = <3387341>; -+ regulator-max-microvolt = <3387341>; -+ lltc,fb-voltage-divider = <511000 158000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ ldo1_reg: ldo1 { -+ regulator-min-microvolt = <1306329>; -+ regulator-max-microvolt = <1306329>; -+ lltc,fb-voltage-divider = <100000 158000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ ldo2_reg: ldo2 { -+ regulator-min-microvolt = <704123>; -+ regulator-max-microvolt = <1456806>; -+ lltc,fb-voltage-divider = <180000 191000>; -+ regulator-ramp-delay = <7000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ ldo3_reg: ldo3 { -+ regulator-min-microvolt = <2800000>; -+ regulator-max-microvolt = <2800000>; -+ regulator-boot-on; -+ }; -+ -+ ldo4_reg: ldo4 { -+ regulator-min-microvolt = <1200000>; -+ regulator-max-microvolt = <3200000>; -+ }; -+ }; -+ }; -+}; -diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory.dts ---- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory.dts 2016-02-04 08:31:38.730794858 -0600 -@@ -0,0 +1,18 @@ -+/* -+ * USB armory MkI device mode device tree file -+ * https://inversepath.com/usbarmory -+ * -+ * Copyright (C) 2015, Inverse Path -+ * Andrej Rosano -+ * -+ * Licensed under GPLv2 -+ */ -+ -+/dts-v1/; -+ -+#include "imx53-usbarmory-common.dtsi" -+ -+&usbotg { -+ dr_mode = "peripheral"; -+ status = "okay"; -+}; -diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-gpio.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-gpio.dts ---- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-gpio.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-gpio.dts 2016-02-04 08:31:38.730794858 -0600 -@@ -0,0 +1,26 @@ -+/* -+ * USB armory MkI device mode device tree file -+ * https://inversepath.com/usbarmory -+ * -+ * Copyright (C) 2015, Inverse Path -+ * Andrej Rosano -+ * -+ * Licensed under GPLv2 -+ */ -+ -+/dts-v1/; -+ -+#include "imx53-usbarmory-common.dtsi" -+ -+&usbotg { -+ dr_mode = "peripheral"; -+ status = "okay"; -+}; -+ -+&iomuxc { -+ pinctrl-0 = <&pinctrl_gpio5>; -+}; -+ -+&uart1 { -+ status = "disabled"; -+}; -diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-host.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-host.dts ---- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-host.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-host.dts 2016-02-04 08:31:38.730794858 -0600 -@@ -0,0 +1,18 @@ -+/* -+ * USB armory MkI host mode device tree file -+ * https://inversepath.com/usbarmory -+ * -+ * Copyright (C) 2015, Inverse Path -+ * Andrej Rosano -+ * -+ * Licensed under GPLv2 -+ */ -+ -+/dts-v1/; -+ -+#include "imx53-usbarmory-common.dtsi" -+ -+&usbotg { -+ dr_mode = "host"; -+ status = "okay"; -+}; -diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-i2c.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-i2c.dts ---- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-i2c.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-i2c.dts 2016-02-04 08:31:38.730794858 -0600 -@@ -0,0 +1,32 @@ -+/* -+ * USB armory MkI device mode device tree file -+ * https://inversepath.com/usbarmory -+ * -+ * Copyright (C) 2015, Inverse Path -+ * Andrej Rosano -+ * -+ * Licensed under GPLv2 -+ */ -+ -+/dts-v1/; -+ -+#include "imx53-usbarmory-common.dtsi" -+ -+&usbotg { -+ dr_mode = "peripheral"; -+ status = "okay"; -+}; -+ -+&uart1 { -+ status = "disabled"; -+}; -+ -+&iomuxc { -+ pinctrl-0 = <&pinctrl_i2c1_pinheader>; -+}; -+ -+&i2c1 { -+ ltc3589: pmic@34 { -+ status = "disabled"; -+ }; -+}; -diff -Nru linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-spi.dts linux-4.4/arch/arm/boot/dts/imx53-usbarmory-spi.dts ---- linux-4.4-orig/arch/arm/boot/dts/imx53-usbarmory-spi.dts 1969-12-31 18:00:00.000000000 -0600 -+++ linux-4.4/arch/arm/boot/dts/imx53-usbarmory-spi.dts 2016-02-04 08:31:38.730794858 -0600 -@@ -0,0 +1,45 @@ -+/* -+ * USB armory MkI device mode device tree file -+ * https://inversepath.com/usbarmory -+ * -+ * Copyright (C) 2015, Inverse Path -+ * Andrej Rosano -+ * -+ * Licensed under GPLv2 -+ */ -+ -+/dts-v1/; -+ -+#include "imx53-usbarmory-common.dtsi" -+ -+&usbotg { -+ dr_mode = "peripheral"; -+ status = "okay"; -+}; -+ -+&uart1 { -+ status = "disabled"; -+}; -+ -+&iomuxc { -+ pinctrl-0 = <&pinctrl_ecspi2>; -+}; -+ -+&ecspi2 { -+ fsl,spi-num-chipselects = <2>; -+ cs-gpios = <&gpio5 29 0>, <&gpio5 30 0>; -+ status = "okay"; -+ -+ flash: m25p40@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "st,m25p40", "st,m25p"; -+ spi-max-frequency = <20000000>; -+ reg = <0>; -+ -+ partition@0 { -+ label = "test-partition"; -+ reg = <0x0 0x80000>; -+ }; -+ }; -+}; -diff -Nru linux-4.4-orig/arch/arm/boot/dts/Makefile linux-4.4/arch/arm/boot/dts/Makefile ---- linux-4.4-orig/arch/arm/boot/dts/Makefile 2016-02-04 13:29:20.880919101 -0600 -+++ linux-4.4/arch/arm/boot/dts/Makefile 2016-02-04 13:27:10.733849955 -0600 -@@ -278,6 +278,10 @@ - imx53-smd.dtb \ - imx53-tx53-x03x.dtb \ - imx53-tx53-x13x.dtb \ -+ imx53-usbarmory.dtb \ -+ imx53-usbarmory-host.dtb \ -+ imx53-usbarmory-i2c.dtb \ -+ imx53-usbarmory-gpio.dtb \ - imx53-voipac-bsb.dtb - dtb-$(CONFIG_SOC_IMX6Q) += \ - imx6dl-apf6dev.dtb \ diff --git a/nixos/hardware/lenovo/ideapad/default.nix b/nixos/hardware/lenovo/ideapad/default.nix deleted file mode 100644 index d774ba3793af..000000000000 --- a/nixos/hardware/lenovo/ideapad/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - imports = [ ../../common/pc/laptop ]; -} diff --git a/nixos/hardware/lenovo/ideapad/z510/default.nix b/nixos/hardware/lenovo/ideapad/z510/default.nix deleted file mode 100644 index 83f656806854..000000000000 --- a/nixos/hardware/lenovo/ideapad/z510/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ lib, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel - ]; - - # https://github.com/NixOS/nixpkgs/issues/18356 - boot.blacklistedKernelModules = [ "nouveau" ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/default.nix b/nixos/hardware/lenovo/thinkpad/default.nix deleted file mode 100644 index 99d4937e49c7..000000000000 --- a/nixos/hardware/lenovo/thinkpad/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ ../../common/pc/laptop ]; - - hardware.trackpoint.enable = lib.mkDefault true; - hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable; - - # Fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) - # services.fprintd.enable = true; -} diff --git a/nixos/hardware/lenovo/thinkpad/e495/default.nix b/nixos/hardware/lenovo/thinkpad/e495/default.nix deleted file mode 100644 index 51ddb5cfd010..000000000000 --- a/nixos/hardware/lenovo/thinkpad/e495/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/amd - ]; - - # see https://github.com/NixOS/nixpkgs/issues/69289 - boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.2") pkgs.linuxPackages_latest; -} diff --git a/nixos/hardware/lenovo/thinkpad/l13/default.nix b/nixos/hardware/lenovo/thinkpad/l13/default.nix deleted file mode 100644 index 3c09f5091ed8..000000000000 --- a/nixos/hardware/lenovo/thinkpad/l13/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ nixos, lib, pkgs, config, stdenv, ... }: -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../. - ]; - - services.throttled.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/lenovo/thinkpad/p53/default.nix b/nixos/hardware/lenovo/thinkpad/p53/default.nix deleted file mode 100644 index a499d5c2d51e..000000000000 --- a/nixos/hardware/lenovo/thinkpad/p53/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ nixos, pkgs, lib, config, stdenv, ... }: -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../. - ]; - - services.throttled.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/lenovo/thinkpad/t410/default.nix b/nixos/hardware/lenovo/thinkpad/t410/default.nix deleted file mode 100644 index c40801ffc0bc..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t410/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../tp-smapi.nix - ../../../common/cpu/intel - ]; - - boot = { - # TODO: this configuration seems to be very aggressive. - # Ask @peti if it's stable or not. - kernelParams = [ - "drm.debug=0" - "drm.vblankoffdelay=1" - "i915.semaphores=1" - "i915.modeset=1" - "i915.use_mmio_flip=1" - "i915.powersave=1" - "i915.enable_ips=1" - "i915.disable_power_well=1" - "i915.enable_hangcheck=1" - "i915.enable_cmd_parser=1" - "i915.fastboot=0" - "i915.enable_ppgtt=1" - "i915.reset=0" - "i915.lvds_use_ssc=0" - "i915.enable_psr=0" - "vblank_mode=0" - "i915.i915_enable_rc6=1" - ]; - blacklistedKernelModules = [ - "sierra_net" "cdc_mbim" "cdc_ncm" "btusb" - ]; - }; -} diff --git a/nixos/hardware/lenovo/thinkpad/t420/default.nix b/nixos/hardware/lenovo/thinkpad/t420/default.nix deleted file mode 100644 index 5d3efe831c96..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t420/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/t430/default.nix b/nixos/hardware/lenovo/thinkpad/t430/default.nix deleted file mode 100644 index bdad1be9878a..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t430/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ]; - - boot = { - kernelParams = [ - # fixes brightness keys, see https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_T430s - "acpi_osi\='!Windows 2012'" - ]; - }; -} diff --git a/nixos/hardware/lenovo/thinkpad/t440p/default.nix b/nixos/hardware/lenovo/thinkpad/t440p/default.nix deleted file mode 100644 index 4dd4085794fa..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t440p/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel - ]; - - boot = { - extraModprobeConfig = lib.mkDefault '' - options bbswitch use_acpi_to_detect_card_state=1 - ''; - # TODO: probably enable tcsd? Is this line necessary? - kernelModules = [ "tpm-rng" ]; - }; -} diff --git a/nixos/hardware/lenovo/thinkpad/t440s/default.nix b/nixos/hardware/lenovo/thinkpad/t440s/default.nix deleted file mode 100644 index c40ad90f9b3d..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t440s/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ]; - - boot = { - # TODO: probably enable tcsd? Is this line necessary? - kernelModules = [ "tpm-rng" ]; - }; -} diff --git a/nixos/hardware/lenovo/thinkpad/t450s/default.nix b/nixos/hardware/lenovo/thinkpad/t450s/default.nix deleted file mode 100644 index e62337171b9a..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t450s/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../. - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/t460s/default.nix b/nixos/hardware/lenovo/thinkpad/t460s/default.nix deleted file mode 100644 index e62337171b9a..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t460s/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../. - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/t470s/default.nix b/nixos/hardware/lenovo/thinkpad/t470s/default.nix deleted file mode 100644 index e62337171b9a..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t470s/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../. - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/t480s/default.nix b/nixos/hardware/lenovo/thinkpad/t480s/default.nix deleted file mode 100644 index 1a14afa6b5e4..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t480s/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../. - ]; - - services.throttled.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/lenovo/thinkpad/t490/default.nix b/nixos/hardware/lenovo/thinkpad/t490/default.nix deleted file mode 100644 index 3578da66c73d..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t490/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ nixos, lib, pkgs, config, stdenv, ... }: -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../. - ]; - - services = { - # This fixes the pulseaudio profiles of the Thinkpad T490. - # The laptop contains a single audio card with 5 sub-devices. Default pulseaudio only offers a single sink - # which can only be switched between speaker/HDMI via a manual profile change. - # This configures a profile set for pulseaudio which offers multiple sinks corresponding to the - # speaker + 4 HDMI ports. This allows the user to play audio streams on the speaker and any of the 4 HDMI/USB-C - # ports at the same time. - udev.extraRules = let - t490ProfileSet = ./t490-profile-set.conf; - in '' - SUBSYSTEM!="sound", GOTO="pulseaudio_end" - ACTION!="change", GOTO="pulseaudio_end" - KERNEL!="card*", GOTO="pulseaudio_end" - - # Lenovo T490 - ATTRS{vendor}=="0x8086" ATTRS{device}=="0x9dc8" ATTRS{subsystem_vendor}=="0x17aa", ATTRS{subsystem_device}=="0x2279", ENV{PULSE_PROFILE_SET}="${t490ProfileSet}" - - LABEL="pulseaudio_end" - ''; - - throttled.enable = lib.mkDefault true; - }; -} diff --git a/nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf b/nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf deleted file mode 100644 index 98f8f0318de1..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t490/t490-profile-set.conf +++ /dev/null @@ -1,107 +0,0 @@ -[Profile speaker+hdmi-stereo] -description = Speaker + HDMI Stereo -output-mappings = analog-stereo hdmi-stereo hdmi-stereo-extra1 hdmi-stereo-extra2 -input-mappings = analog-stereo - -[Mapping analog-stereo] -device-strings = front:%f -channel-map = left,right -paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 -paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic -priority = 15 - -[Mapping hdmi-stereo] -description = Stereo (HDMI) -device-strings = hdmi:%f -paths-output = hdmi-output-0 -channel-map = left,right -priority = 6 -direction = output - -[Mapping hdmi-stereo-extra1] -description = Stereo (HDMI 2) -device-strings = hdmi:%f,1 -paths-output = hdmi-output-1 -channel-map = left,right -priority = 8 -direction = output - -[Mapping hdmi-stereo-extra2] -description = Stereo (HDMI 3) -device-strings = hdmi:%f,2 -paths-output = hdmi-output-2 -channel-map = left,right -priority = 6 -direction = output - -[Profile speaker+hdmi-surround] -description = Speaker + HDMI 5.1 -output-mappings = analog-stereo hdmi-surround hdmi-surround-extra1 hdmi-surround-extra2 -input-mappings = analog-stereo - -[Mapping analog-stereo] -device-strings = front:%f -channel-map = left,right -paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 -paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic -priority = 15 - -[Mapping hdmi-surround] -description = Digital Surround 5.1 (HDMI) -device-strings = hdmi:%f -paths-output = hdmi-output-0 -channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -priority = 6 -direction = output - -[Mapping hdmi-surround-extra1] -description = Digital Surround 5.1 (HDMI 2) -device-strings = hdmi:%f,1 -paths-output = hdmi-output-1 -channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -priority = 8 -direction = output - -[Mapping hdmi-surround-extra2] -description = Digital Surround 5.1 (HDMI 3) -device-strings = hdmi:%f,2 -paths-output = hdmi-output-2 -channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -priority = 6 -direction = output - -[Profile speaker+hdmi-surround71] -description = Speaker + HDMI 7.1 -output-mappings = analog-stereo hdmi-surround71 hdmi-surround71-extra1 hdmi-surround71-extra2 -input-mappings = analog-stereo - -[Mapping analog-stereo] -device-strings = front:%f -channel-map = left,right -paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 -paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic -priority = 15 - -[Mapping hdmi-surround71] -description = Digital Surround 7.1 (HDMI) -device-strings = hdmi:%f -paths-output = hdmi-output-0 -channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right -priority = 6 -direction = output - -[Mapping hdmi-surround71-extra1] -description = Digital Surround 7.1 (HDMI 2) -device-strings = hdmi:%f,1 -paths-output = hdmi-output-1 -channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right -priority = 8 -direction = output - -[Mapping hdmi-surround71-extra2] -description = Digital Surround 7.1 (HDMI 3) -device-strings = hdmi:%f,2 -paths-output = hdmi-output-2 -channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right -priority = 6 -direction = output diff --git a/nixos/hardware/lenovo/thinkpad/t495/default.nix b/nixos/hardware/lenovo/thinkpad/t495/default.nix deleted file mode 100644 index 64957e6e06c7..000000000000 --- a/nixos/hardware/lenovo/thinkpad/t495/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/amd - ../../../common/pc/laptop/acpi_call.nix - ]; - - # Force use of the thinkpad_acpi driver for backlight control. - # This allows the backlight save/load systemd service to work. - boot.kernelParams = [ "acpi_backlight=native" ]; - - # see https://github.com/NixOS/nixpkgs/issues/69289 - boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.2") pkgs.linuxPackages_latest; -} diff --git a/nixos/hardware/lenovo/thinkpad/tp-smapi.nix b/nixos/hardware/lenovo/thinkpad/tp-smapi.nix deleted file mode 100644 index 451dd28ece03..000000000000 --- a/nixos/hardware/lenovo/thinkpad/tp-smapi.nix +++ /dev/null @@ -1,11 +0,0 @@ -# tp_smapi works on ThinkPads made before 2013. See compat table: -# https://www.thinkwiki.org/wiki/Tp_smapi#Model-specific_status - -{ config, ... }: - -{ - boot = { - kernelModules = [ "tp_smapi" ]; - extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ]; - }; -} diff --git a/nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix b/nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix deleted file mode 100644 index 09a0ec1700a5..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x1-extreme/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../../../common/pc/laptop/ssd - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix b/nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix deleted file mode 100644 index 6b0ebbd5d1e3..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x1-extreme/gen2/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ config, lib, ... }: - -with lib; - -{ - imports = [ - ../. - ]; - - # Fixes an issue with incorrect battery reporting. See - # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Extreme_(Gen_2)#Invalid_Stats_Workaround - boot.initrd.availableKernelModules = [ "battery" ]; - - # New ThinkPads have a different TrackPoint manufacturer/name. - # See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/ - hardware.trackpoint.device = "TPPS/2 Elan TrackPoint"; - - # Since the HDMI port is connected to the NVIDIA card. - hardware.bumblebee.connectDisplay = true; - - nixpkgs.overlays = [ - (self: super: { - bumblebee = super.bumblebee.override { - extraNvidiaDeviceOptions = '' - Option "AllowEmptyInitialConfiguration" - ''; - }; - }) - ]; - - services.xserver = mkMerge [ - { - # Set the right DPI. xdpyinfo says the screen is 508×285 mm but - # it actually is 344×193 mm. - monitorSection = '' - DisplaySize 344 193 - ''; - } - - # To support intel-virtual-output when using Bumblebee. - (mkIf config.hardware.bumblebee.enable { - deviceSection = ''Option "VirtualHeads" "1"''; - videoDrivers = [ "intel" ]; - }) - ]; - - services.throttled.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix b/nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix deleted file mode 100644 index 0b8555fbfb08..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x1/6th-gen/QHD/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -# X1 6th generation with a QHD (2560x1440px) display -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ]; - - # Fix font sizes in X - services.xserver.dpi = 210; - fonts.fontconfig.dpi = 210; - - # Fix sizes of GTK/GNOME ui elements - environment.variables = { - GDK_SCALE = lib.mkDefault "2"; - GDK_DPI_SCALE= lib.mkDefault "0.5"; - }; - # Enable readable font on console. The example configuration that - # follows is taliored towards western languages. To see how to - # configure the font download the source tarball from - # http://terminus-font.sourceforge.net/ and read the README file on - # the root dir - - # i18n = { - # # this means ISO8859-1 or ISO8859-15 or Windows-1252 codepages - # # (ter-1), 16x32 px (32), normal font weight (n) - # consoleFont = "ter-132n"; - # consoleKeyMap = "us"; - # defaultLocale = "en_US.UTF-8"; - # consolePackages = [ pkgs.terminus_font ]; - # }; - - # Early configure the console to make the font readable from the - # start - # boot.earlyVconsoleSetup = true; -} diff --git a/nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix b/nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix deleted file mode 100644 index 00446b8c278b..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x1/6th-gen/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# A good source of information about how to fix the issues still -# standing with kernel 4.6.11 is the following wiki page: -# https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6). The -# TrackPoint and TouchPad issues there seem to have been fixed already. -# -# Enable the lower-power S3 suspend state by upgrading the BIOS to version >= 1.30, -# then manually selecting Linux in the power management section. -{ config, pkgs, lib, ... }: -{ - imports = [ - ../. - ../../../../common/pc/laptop/acpi_call.nix - ]; - - # New ThinkPads have a different TrackPoint manufacturer/name. - # See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/ - hardware.trackpoint.device = "TPPS/2 Elan TrackPoint"; - - services.throttled.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix b/nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix deleted file mode 100644 index 02f0fdf0ebb9..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x1/7th-gen/audio.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, pkgs, ... }: -{ - # This can be removed when the default kernel is at least version 5.6 - # https://github.com/NixOS/nixpkgs/pull/86168 - boot.kernelPackages = lib.mkIf - (lib.versionOlder pkgs.linux.version "5.6") - (lib.mkDefault pkgs.linuxPackages_5_6); - - # This can be removed when PulseAudio is at least version 14 - # https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_7)#Audio - hardware.pulseaudio.extraConfig = '' - load-module module-alsa-sink device=hw:0,0 channels=4 - load-module module-alsa-source device=hw:0,6 channels=4 - ''; -} diff --git a/nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix b/nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix deleted file mode 100644 index 8349d05678a2..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x1/7th-gen/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ../. - ../../../../common/pc/laptop/acpi_call.nix - ./audio.nix - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/x1/default.nix b/nixos/hardware/lenovo/thinkpad/x1/default.nix deleted file mode 100644 index 870d9a857742..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x1/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ../. - ../../../common/cpu/intel - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/x140e/default.nix b/nixos/hardware/lenovo/thinkpad/x140e/default.nix deleted file mode 100644 index c03410e936e2..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x140e/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/amd - ]; - - boot.extraModprobeConfig = lib.mkDefault '' - options snd_hda_intel enable=0,1 - ''; - - services.xserver.videoDrivers = [ "ati" ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/x220/default.nix b/nixos/hardware/lenovo/thinkpad/x220/default.nix deleted file mode 100644 index 3cf18e397469..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x220/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/hdd # TODO: reverse compat - ../tp-smapi.nix - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/x230/default.nix b/nixos/hardware/lenovo/thinkpad/x230/default.nix deleted file mode 100644 index 58b09f4c5d5f..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x230/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ]; - - boot = { - kernelModules = [ - "tpm-rng" - ]; - }; - - services.xserver.deviceSection = lib.mkDefault '' - Option "TearFree" "true" - ''; -} diff --git a/nixos/hardware/lenovo/thinkpad/x250/default.nix b/nixos/hardware/lenovo/thinkpad/x250/default.nix deleted file mode 100644 index 55ae2096342e..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x250/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/x260/default.nix b/nixos/hardware/lenovo/thinkpad/x260/default.nix deleted file mode 100644 index d64a53075163..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x260/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ]; - - # https://wiki.archlinux.org/index.php/TLP#Btrfs - services.tlp.extraConfig = '' - SATA_LINKPWR_ON_BAT=med_power_with_dipm - ''; -} diff --git a/nixos/hardware/lenovo/thinkpad/x270/default.nix b/nixos/hardware/lenovo/thinkpad/x270/default.nix deleted file mode 100644 index 870d9a857742..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x270/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ../. - ../../../common/cpu/intel - ]; -} diff --git a/nixos/hardware/lenovo/thinkpad/x280/default.nix b/nixos/hardware/lenovo/thinkpad/x280/default.nix deleted file mode 100644 index a9423e547321..000000000000 --- a/nixos/hardware/lenovo/thinkpad/x280/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - imports = [ - ../. - ../../../common/cpu/intel - ../../../common/pc/laptop/acpi_call.nix - ../../../common/pc/laptop/ssd/default.nix - ]; - - services.throttled.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/microsoft/hyper-v/README.md b/nixos/hardware/microsoft/hyper-v/README.md deleted file mode 100644 index f396214e09fd..000000000000 --- a/nixos/hardware/microsoft/hyper-v/README.md +++ /dev/null @@ -1,63 +0,0 @@ -This is a setup for installing NixOS in Hyper-V as a guest. - -I don't have details handy anymore on the detailed steps I had to do on the Windows host -(there's no NixWindows yet, unfortunately...), so you'll have to try googling that yourself, e.g. something like -"linux on hyper-v" or "ubuntu on hyper-v". (You're welcome to send PRs with improvements of this guide.) -Below, I'm providing only the info with what to do on the NixOS side of things. - -## Installation ## - -I basically followed the [guide for NixOS on VirtualBox](https://nixos.org/wiki/Installing_NixOS_in_a_VirtualBox_guest). -However, some additional changes in `/etc/nixos/configuration.nix` were required to really make it work -(I don't include them as a .nix file, as they must be done **before `nixos-install`**, and I'm not sure how to proceed -with cloning the nixos-hardware repo at this stage): - - # REQUIRED - see: https://github.com/nixos/nixpkgs/issues/9899 - boot.initrd.kernelModules = ["hv_vmbus" "hv_storvsc"]; - - # RECOMMENDED - # - use 800x600 resolution for text console, to make it easy to fit on screen - boot.kernelParams = ["video=hyperv_fb:800x600"]; # https://askubuntu.com/a/399960 - # - avoid a problem with `nix-env -i` running out of memory - boot.kernel.sysctl."vm.overcommit_memory" = "1"; # https://github.com/NixOS/nix/issues/421 - - # UNKNOWN - not sure if below are needed; were suggested for VirtualBox and I used them - boot.loader.grub.device = "/dev/sda"; - boot.initrd.checkJournalingFS = false; - -## Shared folder ## - -To share a folder between Windows host and Linux/NixOS guest, the typical solution seems to be to make a folder "shared" -on Windows, then access it via Samba from NixOS. -On the Windows host, I had to make an additional virtual switch in Hyper-V Manager, with mode "internal". -Then in properties of the virtual network card on Windows host (attached to the virtual switch), I -changed the IP to a fixed 10.0.0.100 (mask 255.255.255.240). I also added a special purpose user on the host, with some -long randomly generated password, to act as Samba credentials for NixOS. -To test that it works, I used the following commands: - - $ nix-env -iA nixos.samba - $ smbclient -L //10.0.0.100 -U shares-guest%ReplaceWithSomeLongRandomlyGeneratedPassword - Domain=[DESKTOP-ABCD123] OS=[Windows 10 Pro 14393] Server=[Windows 10 Pro 6.3] - - Sharename Type Comment - --------- ---- ------- - ADMIN$ Disk Administracja zdalna - C$ Disk Domyślny udział - IPC$ IPC Zdalne wywołanie IPC - shared-space Disk - Connection to 10.0.0.100 failed (Error NT_STATUS_RESOURCE_NAME_NOT_FOUND) - NetBIOS over TCP disabled -- no workgroup available - - $ nix-env -e samba - -Then I added the following lines in `/etc/nixos/configuration.nix`: - - # Client for shared folder on Windows Hyper-V host - # Based on: nixpkgs.git/nixos/tests/samba.nix - fileSystems."/vm-share" = { - fsType = "cifs"; - device = "//10.0.0.100/shared-space"; - options = [ "username=shares-guest" "password=ReplaceWithSomeLongRandomlyGeneratedPassword" ]; - }; - networking.interfaces.eth1.ip4 = [{address="10.0.0.101"; prefixLength=28;}]; - diff --git a/nixos/hardware/microsoft/surface-pro/3/README.wiki b/nixos/hardware/microsoft/surface-pro/3/README.wiki deleted file mode 100644 index 9ffdc559e183..000000000000 --- a/nixos/hardware/microsoft/surface-pro/3/README.wiki +++ /dev/null @@ -1,41 +0,0 @@ -Work in progress. This is the setup for a dual-boot windows/NixOS. - -== Installation == - -Current requirements: -* USB stick -* Latest unstable minimal installation iso, I used [[https://nixos.org/releases/nixos/unstable/nixos-15.05pre61665.4c01e6d/nixos-minimal-15.05pre61665.4c01e6d-x86_64-linux.iso the 15.06-pre one]] -* (maybe) USB keyboard and therefore a USB hub -* WiFi SSID and password - -In the current installation iso, the kernel doesn't support the MS Type cover yet, so you need a USB keyboard for the initial install. Also note that at one point the keyboard wasn't working, and I couldn't see it in lsusb output. After a cold boot it worked fine. - -=== Steps === - -Preparation: -* Copy the ISO to the USB stick as explained [[https://nixos.org/nixos/manual/sec-installation.html#sec-booting-from-usb in the manual]]. Note that if you just dd the image onto the USB stick, it will boot without changes -* With Windows Disk Management, shrink the windows disk so you have room for your installation. Use the free space to create a new partition without a filesystem or drive letter. -* Check out [[https://github.com/cransom/surface-pro-3-nixos this expression and set of patches]] and add it to support newer versions of the Type Cover as well as enable the touch screen. - -* Reboot the Surface and furiously tap Esc until you end up in the BIOS screen. There, turn off secure boot (don't delete the keys), and change the boot order to USB + SSD. Save. -* You should now be in the NixOS installer -* Attach the USB stick and keyboard if the Type Cover doesn't work. The NixOS manual is at alt+F8 - -Installation: -* Using gdisk, print your partition table to find the empty partition you created. Find the EFI partition number (1 for me) and your new partition number (5 for me). -* Create your filesystem of choice on the partition, I picked btrfs: `mkfs.btrfs -L root /dev/disk/by-id/xxx-5` (xxx is the samsung ssd). Mount it on /mnt. -** With btrfs it's wise to put the nix store in its own subvolume: `btrfs subvol create /mnt/nix; btrfs subvol create /mnt/nix/store` -* We'll be using Gummiboot, which needs to access the EFI partition. `mkdir /mnt/boot; mount /dev/disk/by-id/xxx-1` -* Initialize your hardware configuration: `nixos-generate-config --root /mnt` -* Create your wifi credentials: `wpa_passphrase SSID PASS > /etc/wpa_supplicant.conf; cp /etc/wpa_supplicant.conf /mnt/etc`. Check that ifconfig gets an ip address. -* Edit /mnt/etc/configuration.nix, making sure that you have at least: - networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - boot.kernelPackages = pkgs.linuxPackages_latest; - # be able to use the type cover in the initrd - boot.kernelModules = [ "hid-microsoft" ]; -* Install: `nixos-install` - -If this completes successfully, you should be able to reboot, remove the USB stick, and NixOS should come up. - -'''Note''': If using the hid-multitouch patch, you can boot windows as well as other profiles of NixOS without using a usb keyboard. diff --git a/nixos/hardware/microsoft/surface-pro/3/default.nix b/nixos/hardware/microsoft/surface-pro/3/default.nix deleted file mode 100644 index a09c60b1f205..000000000000 --- a/nixos/hardware/microsoft/surface-pro/3/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, ... }: - -{ - # to use the type cover in the initrd - boot.kernelModules = [ "hid-microsoft" ]; - - # TODO: reverse compat - networking.wireless.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/pcengines/apu/default.nix b/nixos/hardware/pcengines/apu/default.nix deleted file mode 100644 index 521887fe600b..000000000000 --- a/nixos/hardware/pcengines/apu/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - boot.kernelParams = [ "console=ttyS0,115200n8" ]; - boot.loader.grub.extraConfig = " - serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 - terminal_input serial - terminal_output serial - "; -} diff --git a/nixos/hardware/purism/librem/13v3/README.md b/nixos/hardware/purism/librem/13v3/README.md deleted file mode 100644 index b4bae0b2f886..000000000000 --- a/nixos/hardware/purism/librem/13v3/README.md +++ /dev/null @@ -1,87 +0,0 @@ -This config is for [Librem 13v3](https://puri.sm/products/librem-13/) and [15v3](https://puri.sm/products/librem-15/) Laptops from Purism. - - -Librem comes with Coreboot + SeaBIOS payload. That means EFI boot is not -possible. Use `fdisk` to partition hard drive, and GRUB as a bootloader: - -```nix -{ - boot.loader.grub = { - enable = true; - device = "/dev/sda"; - version = 2; - }; -} -``` - -## Adding a PureOS partition to the GRUB menu - -I first assume that `boot.loader.grub.useOSProber = true;` should be sufficient. -However GRUB was not able to identify the disks correctly and it took me several -reinstallation till setting `boot.loader.grub.fsIdentifier= "provided";` and using -boot.loader.grub.extraEntries allowed me to dual boot NixOS and PureOS. - -Be aware that each time the PureOS updates the /boot/grub/grub.cfg you will be unable -to boot into NixOS unless you patch grub.cfg manually again. - -Therefore: If you want to be able to boot into your old PureOS distribution -add the following lines, assuming that you have a separate boot partition -Adapt linux version and the UUID to your disk!! - - -```nix -{ - boot.loader.grub.useOSProber = false; - boot.loader.grub.fsIdentifier= "provided"; - boot.loader.grub.extraEntries = '' - menuentry "PureOS with linux 4.19.0-5-amd64 on /dev/sdb2 " { - insmod gzio - if [ x$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi - insmod part_msdos - insmod ext2 - set root='hd0,msdos1' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 ef7a4dcf-8cc4-4870-b860-3ed64906f9b9 - else - search --no-floppy --fs-uuid --set=root ef7a4dcf-8cc4-4870-b860-3ed64906f9b9 - fi - linux /vmlinuz-4.19.0-5-amd64 root=UUID=43899f26-04f2-4ccb-b52a-c9441f1a1a6d ro quiet splash resume=UUID=923317f8-d8bb-4e1f-bca3-f36a556de609 # $vt_handoff - initrd /initrd.img-4.19.0-5-amd64 - }; -} -``` - -## Automatically lock the desktop when removing the librem key - -The [instructions](https://docs.puri.sm/Librem_Key/Getting_Started/User_Manual.html#automatically-lock-the-desktop-when-removing-the-librem-key) to lock the screen after unplugging the [Librem Key](https://puri.sm/products/librem-key/#overview) don't work under NixOS. - -This snippet works on my Librem 15v3 laptop running KDE without wayland and is using the xlock from the package xlockmore. - -```nix -{ pkgs, services , systemd, ... }: -let - libremScreenSaver = pkgs.writeScriptBin "libremScreenSaver" '' - #!${pkgs.bash}/bin/bash - user=`ps aux | egrep "start_kdeinit|gdm-(wayland|x)-session"| head -n 1 | awk '{print $1}'` - if [ -n "$user" ]; then - sudo -u $user DISPLAY=:0 xlock 2>&1 | logger lockScreen for user $user - else - logger libremScreenSaver failed to find a user. Not running KDE? - fi - ''; - -in { - services.udev.path = [ pkgs.procps pkgs.logger pkgs.gawk pkgs.xlockmore ]; - services.udev.extraRules = '' - ACTION=="remove", ENV{PRODUCT}=="316d/4c4b/101" RUN+="${pkgs.systemd}/bin/systemctl --no-block start lockScreen@%k.service" - ''; - systemd.services."lockScreen@" = { - bindsTo = [ "dev-%i.device"] ; - path = [ pkgs.procps pkgs.logger pkgs.sudo pkgs.xlockmore pkgs.gawk ] ; - serviceConfig = { - Type = "oneshot"; # was simple - ExecStart = "${libremScreenSaver}/bin/libremScreenSaver %I"; - }; - }; -} -``` diff --git a/nixos/hardware/purism/librem/13v3/default.nix b/nixos/hardware/purism/librem/13v3/default.nix deleted file mode 100644 index 89ae07e4e693..000000000000 --- a/nixos/hardware/purism/librem/13v3/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - imports = [ - ../../../common/cpu/intel - ../../../common/pc/laptop - ]; - - # https://github.com/systemd/systemd/pull/9318 - services.udev.extraHwdb = '' - # Purism Librem 13 V3 - evdev:atkbd:dmi:bvn*:bvr*:bd*:svnPurism*:pn*Librem13v3*:pvr* - KEYBOARD_KEY_56=backslash - ''; -} diff --git a/nixos/hardware/purism/librem/15v3 b/nixos/hardware/purism/librem/15v3 deleted file mode 120000 index feb0d06fafda..000000000000 --- a/nixos/hardware/purism/librem/15v3 +++ /dev/null @@ -1 +0,0 @@ -13v3/ \ No newline at end of file diff --git a/nixos/hardware/raspberry-pi/2/README.org b/nixos/hardware/raspberry-pi/2/README.org deleted file mode 100644 index 842919b1acf4..000000000000 --- a/nixos/hardware/raspberry-pi/2/README.org +++ /dev/null @@ -1,23 +0,0 @@ -** Status - -The code in master as of June 2015 should be able to prepare a bootable NixOS -for Raspberry PI 2. - -There are still some drawbacks: - -NixOS does not provide a /boot/config.txt (the FAT32 partition). Making NixOS -work in the Raspberry PI 2 is mainly the result of the recent work of ambro718, -Dezgeg and viric (#nixos@irc.freenode.net). - -** Download - -If you want to test, you can flash this 4GB SD image (DOS partition table + -fat32 + ext4 rootfs): - -magnet:?xt=urn:btih:0def3f6acb3bceddb22cb24098f58e40e2853ec2&dn=rpi2-nixos-4b09501f2-img.xz&tr=udp%3A%2F%2Fopen.demonii.com%3A1337&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80 - -Then you should be able to nixos-rebuild any configuration.nix changes. - -The image is the result of a "nixos-install" alone. No root password has been -set, and it does not include a nixpkgs checkout or channel. In fact I (viric) -created the FS into a NBD, not a real SD, to create this image. diff --git a/nixos/hardware/raspberry-pi/2/default.nix b/nixos/hardware/raspberry-pi/2/default.nix deleted file mode 100644 index d10bbd2424d9..000000000000 --- a/nixos/hardware/raspberry-pi/2/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, pkgs, ...}: - -{ - boot = { - consoleLogLevel = lib.mkDefault 7; - extraTTYs = [ "ttyAMA0" ]; - kernelPackages = lib.mkDefault pkgs.linuxPackages_rpi2; - kernelParams = [ - "dwc_otg.lpm_enable=0" - "console=ttyAMA0,115200" - "rootwait" - "elevator=deadline" - ]; - loader = { - grub.enable = lib.mkDefault false; - generationsDir.enable = lib.mkDefault false; - raspberryPi = { - enable = lib.mkDefault true; - version = lib.mkDefault 2; - }; - }; - }; - - nix.buildCores = 4; - - nixpkgs.config.platform = lib.systems.platforms.raspberrypi2; - - # cpufrequtils doesn't build on ARM - powerManagement.enable = lib.mkDefault false; - - services.openssh.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/samsung/np900x3c/README.wiki b/nixos/hardware/samsung/np900x3c/README.wiki deleted file mode 100644 index e9fc58b8613b..000000000000 --- a/nixos/hardware/samsung/np900x3c/README.wiki +++ /dev/null @@ -1,94 +0,0 @@ -= Overview = - -Most of the features seem to be working with Linux >= 3.9 - -== Hardware == - -* CPU Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz -* RAM 4 GB -* HDD 128GB SSD -* Screen 13.3-Inch Screen -* Graphics Intel HD Graphics 4000, Ivy bridge - -= Configuration = - -Full configurations is in my -[https://raw.github.com/grwlf/nixpkgs/local/machines/samsung-np900x3c-v2.nix nixpkgs branch]. Note, it requires several local packages. - -=== Touchpad === - -Touchpad is detected as 'ETPS/2 Elantech Touchpad'. xf86-input-synaptics handles -it well. Corresponding config lines: - -
-  services.xserver = {
-    synaptics = {
-      enable = true;
-      accelFactor = "0.05";
-      maxSpeed = "10";
-      twoFingerScroll = true;
-      additionalOptions =
-        ''
-        MatchProduct "ETPS"
-        Option "FingerLow"                 "3"
-        Option "FingerHigh"                "5"
-        Option "FingerPress"               "30"
-        Option "MaxTapTime"                "100"
-        Option "MaxDoubleTapTime"          "150"
-        Option "FastTaps"                  "1"
-        Option "VertTwoFingerScroll"       "1"
-        Option "HorizTwoFingerScroll"      "1"
-        Option "TrackstickSpeed"           "0"
-        Option "LTCornerButton"            "3"
-        Option "LBCornerButton"            "2"
-        Option "CoastingFriction"          "20"
-        '';
-      };
-  };
-
- -=== Wireless === - -System requires iwlwifi-6000g2b-6.ucode in order to work. I've extracted the -file from some debian package and placed it into /root/firmware. Corresponding -config settings: - -
-  hardware.firmware = [ "/root/firmware" ];
-
- -= Problems = -There are some. See - -* [http://ubuntuforums.org/showthread.php?t=1737086 Ubuntu thread] -* [http://bugzilla.kernel.org/show_bug.cgi?id=44161 Kernel.org bug] -* [http://jablonskis.org/2012/linux-and-samsung-series-laptop-9-fn-keys/ jablonskis.org] - -=== BIOS problems === -I had to disable SSD boot completely in order to boot from USB. Just changing boot priority didn't help. - -Fix: Update BIOS up to recent version - -=== Battery === -Battery charging/discharging indicator doesn't work good. - -Fix: Update BIOS up to recent version - -=== Lid === -Acpi thinks lid is always open -
-[ierton@greyblade:~]$ cat /proc/acpi/button/lid/LID0/state 
-state:      open
-
- -Related [https://bugzilla.kernel.org/show_bug.cgi?id=44161 Kernel bug #44161] - -=== Multimedia keys === -* rfkill/fanless don't work -* volume up/down don't work -* brightness up/down work, but release is broken -* touchpad disable works - -Related discussion on -[http://jablonskis.org/2012/linux-and-samsung-series-laptop-9-fn-keys/ jablonskis.org] - diff --git a/nixos/hardware/samsung/np900x3c/default.nix b/nixos/hardware/samsung/np900x3c/default.nix deleted file mode 100644 index ced3d7013dd8..000000000000 --- a/nixos/hardware/samsung/np900x3c/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -# TODO: use ../../common/pc/laptop - -{ lib, ... }: - -{ - services.xserver.synaptics.enable = lib.mkDefault true; -} diff --git a/nixos/hardware/supermicro/a1sri-2758f/default.nix b/nixos/hardware/supermicro/a1sri-2758f/default.nix deleted file mode 100644 index 3ffdc0c6e6d2..000000000000 --- a/nixos/hardware/supermicro/a1sri-2758f/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -# http://www.supermicro.com/products/motherboard/Atom/X10/A1SRi-2758F.cfm -# This board contains a TPM header, but you must supply your own module. - -{ pkgs, ... }: - -{ - boot.kernelModules = [ "ipmi_devintf" "ipmi_si" ]; - environment.systemPackages = [ pkgs.ipmitool ]; -} diff --git a/nixos/hardware/supermicro/x10sll-f/default.nix b/nixos/hardware/supermicro/x10sll-f/default.nix deleted file mode 100644 index 10c6cc016035..000000000000 --- a/nixos/hardware/supermicro/x10sll-f/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ ipmitool ]; - - boot.kernelModules = [ "jc42" "ipmi_devintf" "ipmi_si" "tpm_rng" ]; - - # services.cron.systemCronJobs = [ - # # Reset 5-minute watchdog timer every minute - # "* * * * * ${pkgs.ipmitool}/bin/ipmitool raw 0x30 0x97 1 5" - # ]; -} diff --git a/nixos/hardware/tests/build-profile.nix b/nixos/hardware/tests/build-profile.nix deleted file mode 100644 index c4509d36ad33..000000000000 --- a/nixos/hardware/tests/build-profile.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ profile }: - -let - shim = { - boot.loader.systemd-boot.enable = true; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; - fsType = "btrfs"; - }; - - nixpkgs.config = { - allowBroken = true; - allowUnfree = true; - }; - }; -in (import { - configuration.imports = [ profile shim ]; -}).system diff --git a/nixos/hardware/tests/run.py b/nixos/hardware/tests/run.py deleted file mode 100755 index 2f514d128907..000000000000 --- a/nixos/hardware/tests/run.py +++ /dev/null @@ -1,116 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell --quiet -p nix -p python3 -i python - -import argparse -import multiprocessing -import re -import subprocess -import sys -from functools import partial -from pathlib import Path -from typing import List, Tuple - -TEST_ROOT = Path(__file__).resolve().parent -ROOT = TEST_ROOT.parent - -GREEN = "\033[92m" -RED = "\033[91m" -RESET = "\033[0m" - - -def parse_readme() -> List[str]: - profiles = set() - with open(ROOT.joinpath("README.md")) as f: - for line in f: - results = re.findall(r"]+>", line) - profiles.update(results) - return list(profiles) - - -def build_profile( - profile: str, verbose: bool -) -> Tuple[str, subprocess.CompletedProcess]: - # Hard-code this for now until we have enough other architectures to care about this. - system = "x86_64-linux" - if "raspberry-pi/2" in profile: - system = "armv7l-linux" - - cmd = [ - "nix", - "build", - "-f", - "build-profile.nix", - "-I", - f"nixos-hardware={ROOT}", - "--show-trace", - "--system", - system, - "--arg", - "profile", - profile, - ] - - # uses import from derivation - if profile != "": - cmd += ["--dry-run"] - if verbose: - print(f"$ {' '.join(cmd)}") - res = subprocess.run( - cmd, cwd=TEST_ROOT, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, - ) - return (profile, res) - - -def parse_args() -> argparse.Namespace: - parser = argparse.ArgumentParser(description="Run hardware tests") - parser.add_argument( - "--jobs", - type=int, - default=multiprocessing.cpu_count(), - help="Number of parallel evaluations." - "If set to 1 it disable multi processing (suitable for debugging)", - ) - parser.add_argument( - "--verbose", action="store_true", help="Print evaluation commands executed", - ) - parser.add_argument("profiles", nargs="*") - return parser.parse_args() - - -def main() -> None: - args = parse_args() - if len(args.profiles) == 0: - profiles = parse_readme() - else: - profiles = args.profiles - - failed_profiles = [] - - def eval_finished(args: Tuple[str, subprocess.CompletedProcess]) -> None: - profile, res = args - if res.returncode == 0: - print(f"{GREEN}OK {profile}{RESET}") - else: - print(f"{RED}FAIL {profile}:{RESET}", file=sys.stderr) - if res.stdout != "": - print(f"{RED}{res.stdout.rstrip()}{RESET}", file=sys.stderr) - print(f"{RED}{res.stderr.rstrip()}{RESET}", file=sys.stderr) - failed_profiles.append(profile) - - build = partial(build_profile, verbose=args.verbose) - if len(profiles) == 0 or args.jobs == 1: - for profile in profiles: - eval_finished(build(profile)) - else: - pool = multiprocessing.Pool(processes=args.jobs) - for r in pool.imap(build, profiles): - eval_finished(r) - if len(failed_profiles) > 0: - print(f"\n{RED}The following {len(failed_profiles)} test(s) failed:{RESET}") - for profile in failed_profiles: - print(f"{sys.argv[0]} '{profile}'") - sys.exit(1) - - -if __name__ == "__main__": - main() diff --git a/nixos/hardware/toshiba/swanky/README.md b/nixos/hardware/toshiba/swanky/README.md deleted file mode 100644 index ab4c072c6b09..000000000000 --- a/nixos/hardware/toshiba/swanky/README.md +++ /dev/null @@ -1,66 +0,0 @@ -# Toshiba Chromebook 2 `swanky` - -There might be a way to install NixOS without hardware modifications (via -enabled developer mode and SeaBIOS boot on Ctrl+L), however I'd highly -recommend replacing Google's Coreboot payload with Tianocore: that allows for -proper virtualization, suspend, removes annoying developer mode screen, and -generally just works much better. - -These instructions carry some risk of bricking your device, since you'll be -reflashing BIOS. Risk is rather low, but please for the love of god make a BIOS -backup and store it someplace safe. That's the only way to reinstall ChromeOS -back after this procedure (BIOS image has licensing info), and it's much easier -to use a known good state to unbrick the laptop if things go wrong. - -If you ever get unlucky, you can unbrick your device using Raspberry Pi, -some cables and a SOIC clip, see: -http://sicarul.com/how-to-un-brick-your-toshiba-chromebook-2-gandof-without-invoking-any-demons/ - -## Enable developer mode - -This will wipe all user data and settings from the laptop. - -Power off, then hold ESC + Refresh (F3) and abruptly press power button. You -should see "Chrome OS is missing or damaged" message. Press Ctrl+D. Press enter -at the next screen, then press Ctrl+D again. Wait until the laptop boots into -ChromeOS, then power it off. - -## Disable hardware-backed BIOS write protection - -Follow the first part of the guide at: -https://github.com/brendenyule/NativeToshibaCB2Guide/wiki/Remove-Write-Protect - -Ignore SeaBIOS section. I also used some ductape over #5 to make sure that -metallic motherboard shield would not re-enable write protection. - -## Flash Coreboot + Tianocore BIOS - -Prepare a FAT32-formatted flash drive for BIOS backup in advance. - -Go through ChromeOS installation dialogues until you have network access and -are able to log into a guest session. Open Chrome, press Ctrl+Alt+T to open -`crosh`, type in `shell` to get a real shell. Then, run: - -``` -$ cd ~ -$ curl -LO https://mrchromebox.tech/firmware-util.sh -$ sudo bash firmware-util.sh -``` - -Choose "Install/Update Full ROM Firmware" option and follow instructions. -Do not skip BIOS backup! - -Documentation: https://mrchromebox.tech/#fwscript - -## Enable hardware-backed BIOS write protection - -This is a cool security feature, so after flashing Coreboot + Tianocore BIOS -and making sure new BIOS works, consider re-enabling BIOS protection. Just put -in the missing screw #5. - -## Install NixOS - -`dd` an image on a flash drive, partition the drive, etc. On some later models, -you can swap SSD with any other 2242 M.2 SATA SSD, but on `swanky`, you have -to live with what you have (16GB eMMC). I recommend `256MB` for EFI partition, -and the rest for `/`. diff --git a/nixos/hardware/toshiba/swanky/default.nix b/nixos/hardware/toshiba/swanky/default.nix deleted file mode 100644 index 8361df66e53f..000000000000 --- a/nixos/hardware/toshiba/swanky/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, pkgs, ... }: - -let - ucm = pkgs.fetchzip { - url = "https://github.com/plbossart/UCM/archive/2050ca78a4d1a853d1ba050b591f42e6f97adfc0.tar.gz"; - sha256 = "1rs4mpz3b965nmz0yhy6j4ga3fdz320qnpkd7d61nvpv9c3i6zwj"; - }; -in - -{ - imports = [ - ../../common/cpu/intel - ../../common/pc/laptop - ]; - - # Required for screen brightness control: - boot.kernelParams = [ "acpi_backlight=vendor" ]; - - # Sound requires a custom UCM config: - system.replaceRuntimeDependencies = [{ - original = pkgs.alsaLib; - - replacement = pkgs.alsaLib.overrideAttrs (super: { - postFixup = "cp -r ${ucm}/chtmax98090 $out/share/alsa/ucm"; - }); - }]; -} diff --git a/nixos/hardware/tuxedo/infinitybook/v4/default.nix b/nixos/hardware/tuxedo/infinitybook/v4/default.nix deleted file mode 100644 index 36450bf52680..000000000000 --- a/nixos/hardware/tuxedo/infinitybook/v4/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - boot.kernelParams = [ - "i8042.reset" - ]; -} From a04315f38b0557f32e62dedcce45deae943e8539 Mon Sep 17 00:00:00 2001 From: aciceri Date: Sat, 20 Jun 2020 14:56:55 +0200 Subject: [PATCH 357/624] maintainers: added aciceri --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7ee71285138..593ae3f1bbd9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -139,6 +139,12 @@ githubId = 1517066; name = "Aiken Cairncross"; }; + aciceri = { + name = "Andrea Ciceri"; + email = "andrea.ciceri@autistici.org"; + github = "aciceri"; + githubId = 2318843; + }; acowley = { email = "acowley@gmail.com"; github = "acowley"; From 70fa933bf14aba8ede3606191ce667aa5bf88969 Mon Sep 17 00:00:00 2001 From: aciceri Date: Sat, 20 Jun 2020 15:08:46 +0200 Subject: [PATCH 358/624] navidrome: init at 0.23.1 --- pkgs/servers/misc/navidrome/default.nix | 37 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/servers/misc/navidrome/default.nix diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix new file mode 100644 index 000000000000..e5597451062a --- /dev/null +++ b/pkgs/servers/misc/navidrome/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + pname = "navidrome"; + version = "0.23.1"; + + src = fetchurl { + url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; + sha256 = "0hrnlpaq32f8slgmyl629v5b46ar2mq97q0cgrxy6ahfabfw2vih"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + tar xvf $src navidrome + ''; + + installPhase = '' + mkdir -p $out/bin + cp navidrome $out/bin + ''; + + postFixup = '' + wrapProgram $out/bin/navidrome \ + --prefix PATH : ${makeBinPath (optional ffmpegSupport ffmpeg)} + ''; + + meta = { + description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; + homepage = "https://www.navidrome.org/"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aciceri ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16e9a68c443a..f19c46f9f840 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26659,4 +26659,6 @@ in vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; + + navidrome = callPackage ../servers/misc/navidrome {}; } From 3c14632da2111cf31ebd49057cd23780c41017fa Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 20 Jun 2020 17:03:37 +0200 Subject: [PATCH 359/624] CODEOWNERS: adding mmahut to blockchains --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5376d51a6178..d68adc192e19 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -193,3 +193,6 @@ /nixos/modules/virtualisation/cri-o.nix @NixOS/podman /nixos/modules/virtualisation/podman.nix @NixOS/podman /nixos/tests/podman.nix @NixOS/podman + +# Blockchains +/pkgs/applications/blockchains @mmahut From a997afb7daeb0e0ec07c7cc1b34a80edac286ec8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 20 Jun 2020 15:21:19 +0000 Subject: [PATCH 360/624] zstd: Fix cross CMake is a build-time dep, so we need to override it with `buildPackages`, explicitly. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ae58bff225d..14a494a164f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7929,8 +7929,8 @@ in zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { - cmake = cmake.override { - libarchive = libarchive.override { zstd = null; }; + cmake = buildPackages.cmake.override { + libarchive = buildPackages.libarchive.override { zstd = null; }; }; }; From b092390ce2ae93a6da8ca19c2e8706660ff75e0a Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 20 Jun 2020 06:48:11 +0200 Subject: [PATCH 361/624] pythonPackages.pyatmo: add missing dependencies --- pkgs/development/python-modules/pyatmo/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 4013ea789af3..cb628561fda6 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage , fetchPypi +, oauthlib , requests +, requests_oauthlib }: buildPythonPackage rec { @@ -13,7 +15,7 @@ buildPythonPackage rec { sha256 = "9949338833a27b6c3251b52bf70b73aa99c43c56153541338cb63001afafdd1e"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; # Upstream provides no unit tests. doCheck = false; From cf0b491343c65eaca31300e2629a932741780845 Mon Sep 17 00:00:00 2001 From: Shi Han NG Date: Sat, 20 Jun 2020 19:20:27 +0900 Subject: [PATCH 362/624] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 276 ++++++++++++++-------------- 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e3714edc0aef..f8d2cf01c9da 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-06-11"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "1428c7b29e50af56f53ee1d587679d97a027dd72"; - sha256 = "0zhrgfsk7fvs8wabgdp5ps73ggsghsw19cnjvlbw4cnib6p9176a"; + rev = "4f254988064d075bd3c2e08038b501df4d07b78d"; + sha256 = "15l3j6g3k4s08dbqnav1gns5vc5bxx2r4db6zw7ray26bxi1f2ch"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -269,12 +269,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-06-09"; + version = "2020-06-15"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "932648c890d27b3a1f0e5f5f63e4564384dfdb63"; - sha256 = "1p1lrxk45qphpmnkszhaks7li0h3y3biif9427n6mjckl860g5c7"; + rev = "0cbf6ced3c1b6cfd1ab869a46165d69018747550"; + sha256 = "0553m0v48kz2r0vasq4yd0834r066h1mha6sx5k0ls0s0074w10m"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -401,12 +401,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-06-13"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "2c98c9f34718f5f639bfaae1c193fbe39749f7fc"; - sha256 = "126yqr53y4y30p4sp7942nic6lql6lfx0a1wb0psrrvrc8ccbbpp"; + rev = "10a6cc172795d3ba6e9ccb8e1e4d4cdeee66956c"; + sha256 = "1ag1j2szb19d7bi8sfpws3whhq8vzg5gbxygr1shif9bf0dlk447"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -521,12 +521,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-06-12"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "b6ed6dad8c9f57e2ee84b60c0cf69c88c5ccf3bc"; - sha256 = "0abvls1vxyzxzsrlmm5javahsxxslgli43b1ffbrk7cz8cbhgdsy"; + rev = "a75fb41cc7f766f048ed04ff24d2b9036c80a0c1"; + sha256 = "024mpad6cpivxpf9fjrr9mh7iy8hq64d75yazhzm4kax6f121xk0"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -569,12 +569,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2020-05-08"; + version = "2020-06-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "c4b450a62020ff37b27ea0b8d05de3e3c53344c6"; - sha256 = "1hk29c55nk21avhrk9i8dppcid62jnr1y2b9lml14c4y01yr4mpp"; + rev = "241c6b39e6618279b619926269431ef45de87840"; + sha256 = "1x3lrk4x7qhp9pg8x11k36pcgd5f45la4r77fq82jy307s5dny20"; }; meta.homepage = "https://github.com/neoclide/coc-python/"; }; @@ -605,12 +605,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-06-11"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "a2e98801bcbe88d100f2fcb23087ba61203ad101"; - sha256 = "0a2a6pjvbb29syhh796z3gfrgjx4vpkbjirsgzdfb12icigbjdz7"; + rev = "2079280b12e565ae5c437b675f09b7915f1f9d92"; + sha256 = "0l4jz8mdbn352cb7gkycbdlaw18k9qf4v0vcljni7hxdqc6k1hiz"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -713,24 +713,24 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-05-22"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "bac002caef532d6dc58c10a2885eeed463082d4f"; - sha256 = "1b10bdlqbj82rragymka691fz0phgk6v63diijkyb1ia302q1613"; + rev = "a065861bebc201b722145d3d39af76cdbaf92f46"; + sha256 = "1iwp8gs5f49chncbqv5w7x435jhwqczlmw00clf345yvx2kirngn"; }; meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2020-05-14"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "679eb834ac8c16290a0cc50ab7c222e1144644f7"; - sha256 = "1jkz0qixrp7vzpv9l2ls0yl5kyqzi3bbvydpifdb858j8jqbk4dq"; + rev = "6f106f10c981fd314d6a83cab29f8a464da6b34b"; + sha256 = "1b2zac7z8ja1ymf4psd48gwm7cdkyiwyglinpqy5g2zyspc16qpg"; }; meta.homepage = "https://github.com/neoclide/coc-vetur/"; }; @@ -785,12 +785,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-06-13"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d66250193333f786b0706d4f1aebbd3e17505c43"; - sha256 = "0k4f0xf9h6v5xhvkzklg233x6y15bn22yg07g3nkgh10b8mpspbs"; + rev = "aa3647842f5bf436c8e1556667033046d83426d5"; + sha256 = "0gzm0pm3gqis7y3qpmwjgnn5g11ym6s4fj18j5qmdfshbsajh9xv"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -858,12 +858,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-05-26"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "5cb5e37913fa6fe410ee150f5cd8c75e34b060c4"; - sha256 = "1h23qf0i97lcng1llc0q80jizsv7hkpnyvaj5dr3kfbwi84nfkmp"; + rev = "778c8e711a23d6921a99986a00cdbb6d76e1b103"; + sha256 = "1dk0j4f4dpl21rjc7gfl2r23sf0vjajcdyrc20pfr8kan86acz18"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -918,12 +918,12 @@ let csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-05-29"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "c84fd12a226d7b3b8d4b7e77ed5ddd1c5fa970ad"; - sha256 = "1gjhbgwqf1zg813a3wcqj2x29gs4x7yc185mxi3lvnxghwj9j2i3"; + rev = "e999936dc4873708b524f94ae0a42df950900ff8"; + sha256 = "1im11fpavcsyk7pjhnk2kkdnl0q9a6ai3nk3g3av0drm2qvia41x"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -1014,12 +1014,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-06-09"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "bc2a3fcbe9db21623dcc7c2d5c4c1b1289283dfc"; - sha256 = "00gyrfhz7mf93swqzi4n459vbk9rpcqsc9qfzgnv38myh800s2ih"; + rev = "acd68311bbb3296aa81c5799695715e85326b738"; + sha256 = "1rv8b7g6prjibl9hx5wapj71hfg0dd2ipkpdj8w1zj4b0inj5848"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1074,12 +1074,12 @@ let deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-04-14"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "d438a6f550910a5688481ff0251771ac7dd09245"; - sha256 = "0p6kvl1pgf5d5rnag297dhjzzplmawvmi2j1r2m6p0732ls4qxrw"; + rev = "5f23eef76ffe62ddd78a3f3318d4efc6d236f403"; + sha256 = "0gi9r8rvf725s65jafbskkn7c90ld74ckdv9xxm1d6rql0n9dsbb"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1172,12 +1172,12 @@ let deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-04-13"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "42f4c24a951b0fb5e76a70e5234f16193a8a746d"; - sha256 = "1incjz7xsh4cfxw06ff07830ywn0p99b1zmml8pkapbnh3x2bjgc"; + rev = "9ad4cbad7e8052bab042f724c71ba10621542f2c"; + sha256 = "1hfrvgfl9av7c4v1pd04rnp5gcvnl1qwnfgq3vzh288mjs8z1yxk"; fetchSubmodules = true; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; @@ -1293,12 +1293,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-06-11"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "e04bfc18b604c54ebc319d2eebf8fe3a830a9212"; - sha256 = "01bf55zbw2v2qzbpk0jm5j4dhq8rs78m2pbljsnl2772vll4iv38"; + rev = "1a49407cf3eff03359de158151be174956b2ccbc"; + sha256 = "10l91wxfm5019qq16ri316dgwv62ngss8xmf9vpv7lxwspzmc806"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1584,12 +1584,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-06-06"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "bddd18ffabbdb10ca1fadf25e7d7d1201470f444"; - sha256 = "1sxh3zdrwajz0nabqbzg24sxlc8kwiqrwh4mvrwavwyh7xr29jxd"; + rev = "24e67a74e430da87f66fbd88acc01c9227842fde"; + sha256 = "193acbbmkl1102fyhm3kj0jais5b3f6y1rnyhzkikwl3rjjf6gaj"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1824,12 +1824,12 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2020-01-18"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "08e36b649c83eece7edbd2e04e42e077aebc78eb"; - sha256 = "0jawl7fs6wl3ny9vsmzqv5pnkv5nn6wj1nx7hzgdl41183958pni"; + rev = "df359d91510be0c078905568d9033c891a3a2f4b"; + sha256 = "0xqh5hr4m6hm2vfms1iqarzhgkmrgx6f5ywyh6qhwkbrdj8q3lyq"; }; meta.homepage = "https://github.com/neutaaaaan/iosvkem/"; }; @@ -2041,12 +2041,12 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-06-03"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "d6ea4b24b14f3ead29dc8df2e2d942c2b0287948"; - sha256 = "0gh21v0gnwhq2gim1hhfd0376zk4jdhfn9dldczxvzipxw3jaknr"; + rev = "0553fecb3425dafe65a724ad01d85427285ac184"; + sha256 = "0ih6ccsqhqc9cynkzqfb55x5mfz743hvdrxzlhm0axrkxxn3nczb"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; @@ -2089,12 +2089,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-05-18"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "c172131e0369672bc1b9454a2aec6d532d350dcc"; - sha256 = "04nxldbb885n11vwz61c1r4h65y26six5cs9invbz27h4pgyrvna"; + rev = "3afa0102cede4687c05b7cb48b2e15beb236602f"; + sha256 = "1qyf0jsh8fgnmq53dbdrkhlivznjki2vx4rmdp9dvv86zn7xr4mb"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2377,12 +2377,12 @@ let neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2020-06-13"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "a52edf794bae0174a682131333c891717633994b"; - sha256 = "1k3ncjlikdbsjk33fi14y88yqywrpzdfz8kwzjfxjlidbzzlzk0w"; + rev = "2c6c457e0655090639bd8c68f6eac4b01d071696"; + sha256 = "0ca8im1kmj4d1wshjjgci7v2d0szia36hhgnb2dmsg601ninkvmw"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -2497,12 +2497,12 @@ let nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2019-12-17"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "f06189a4c054fe8c22e46aca4d451e03456f2283"; - sha256 = "0gk4zq0gz3nnwfkldswg9bjpk0gf6d6mgfzcgvj0pnlbja6ass81"; + rev = "2124a5a760fb6138b10f38ceac3fce5c19056b9a"; + sha256 = "0g08kydqh58617lxjnlvbvjp0f730kzjpsz44v390sjx2a9xrk23"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; @@ -2569,12 +2569,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-06-13"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "9ec118cdc7ce6442bf8beba903ab395b2f60190f"; - sha256 = "1idam76jwvs82c2384y4az4rqp5cg29qhic12fnpy8m74b3rqla8"; + rev = "a82ce0ebff06ec85ddb2c61763158b8e97b9a85e"; + sha256 = "0dsg79qklb942af0qhpzd8h2j1rllk1qgm88p0s49m7rprfah3g4"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -2665,12 +2665,12 @@ let papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2019-11-06"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "ddd09867ed4e020b3ba2eb47dc3ef365da5b0fed"; - sha256 = "1dhbnd99xs6l5alqhn9m1nynmr9sbvrqj2137l23ysisprl3rgmr"; + rev = "c657f5c2d5964bbae633f8a42c16f8316f6d6733"; + sha256 = "1vv1gd64isrgyxc4fyp5mzlhffwkzdc8agnv0aka4v7qdaca45ni"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -2797,12 +2797,12 @@ let quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2020-05-09"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "95578ca8eef44fcdba5e144b78604018590c6cef"; - sha256 = "1h5kc2wffvaljdvggp2s74jkd7z88y2r5g1flqlgda2x1ihlhavm"; + rev = "03f047175fc3bd3ed9828ccec48b646bc53ab204"; + sha256 = "11wh5jy7b1ncqbgc0nmip38zhz9halglaa3bw9da4qk5fp6xr1a4"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -3169,12 +3169,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-06-11"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "03dc38772d59e78de3d87b27438fecab70dd6688"; - sha256 = "0xn972gppr87lx37p01x1ikh2nwn56szhgnikw1v269vnysic15m"; + rev = "20e41455e1155f5989ecac007fc92c9415244822"; + sha256 = "1jzqz0pi9zaf2ivdvb2prv5k86003dswpv2n3vh5vkmwgl1r3ml4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3314,12 +3314,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-05-12"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "22f3707fd19e1573b4379f3b8db0e967f4ae6492"; - sha256 = "0nj7bsmkw8yc4hfnbsm32lf4qcwc4qd18nr5sb7vrkm6ipsr2qyz"; + rev = "920d465b56bcf96c976fa22e9558d51aa55dcd9c"; + sha256 = "0n7gwdyzim4f92mxnjz4zwfiyapyjhbf21b1l3dq9b07x9m40365"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -3411,12 +3411,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-01-22"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "4d3858eb060a1fd2213b075a707d39cbb118ae3e"; - sha256 = "0qny9z459x7hp5y43iivws2m312clacysdy1nnb3cr1fyhw9pflx"; + rev = "ac40d8c89b9eba8eefdbb8383eba54ab98c13bd5"; + sha256 = "16alf05qzf572nj7dbw9c2s6vxq2raz2kj61jjvdrcfplr0nqqha"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -3807,12 +3807,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-06-11"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "ee85ed4c673b859cf8c3626a6669b8e3cd2392fa"; - sha256 = "1wayink1n9l590kfi28xp37kw186g7j0dr5kgfr7xz8mk2g0wg0k"; + rev = "5ce3e636580dde6653a74535bb7b358725d1e37c"; + sha256 = "02a5nhhyi7k4645jmmgjdj28l46knv7l6219lkgixrbgdq5gc43h"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4167,12 +4167,12 @@ let vim-cursorword = buildVimPluginFrom2Nix { pname = "vim-cursorword"; - version = "2020-05-02"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-cursorword"; - rev = "109604ab6f35744e133802d7cf61795721612cac"; - sha256 = "1mrkkl6pchrmd2s5wjdh46p54hchv7jvgdbjjxmvzhg5ndk0zxvf"; + rev = "cc8114226ceefb5cafe1890e0900d3efb7dab1fd"; + sha256 = "1x5ljk82bxc3qhrq5pz0dsab8rg1234syd1xmpkgvif52s9g4mfk"; }; meta.homepage = "https://github.com/itchyny/vim-cursorword/"; }; @@ -4215,12 +4215,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2020-06-12"; + version = "2020-06-17"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "84ec4562c21882dfe80b779cd645c607ec9d9727"; - sha256 = "1nv7aivnrxa91b2ylxzfiss46r9m2qf13v8wlhav85mgd51nhj99"; + rev = "50eb8e2d88be4e8bbcd8e5ddccbe499b3a1f473d"; + sha256 = "0hgbi7l4qlblmp28gbzzdw0bpfnw1mghyl7prk4zzf8w4m4vsrpa"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -4563,12 +4563,12 @@ let vim-ghost = buildVimPluginFrom2Nix { pname = "vim-ghost"; - version = "2020-06-04"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "fd3665df734c1f8d3620b11fc8bdfacb2faae35e"; - sha256 = "0p1y5g9fj58m48z9c6vdis7d4zajlv9j0y8065rmivws3df9n50j"; + rev = "77330855a36350e75393cdeefb743da1040627ce"; + sha256 = "0g3wvp02cv69v7xcsbib35bw9yf36iq6ffny7lmaf0s1pj2kwpzz"; }; meta.homepage = "https://github.com/raghur/vim-ghost/"; }; @@ -4611,12 +4611,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-06-10"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "e31e9bb35f7346caab4fcf972d44449bdfd3230a"; - sha256 = "1mmasjz0d6nyjjrlgwiz9kd420l16q90mhscwz3i65xw0zqlmcgj"; + rev = "97a24e903a7841f410903087c19eaf728668ec81"; + sha256 = "0qhs5dlnjdmlxcq81ycrcr58szwkqc347pdlz9aj60fss1gw49v5"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4647,12 +4647,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-06-09"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "354774cd7aea891cf553c34d79582be3346c1615"; - sha256 = "0pqmm6s50vxs9788f6avgwrdp1vi5mv3lzrxi2nxqdxvrcxngk93"; + rev = "4ebfb5967fa2aa3269edb3962b347a7e5e213a1b"; + sha256 = "1x8bg9c5yrfydaqkprf0cvl1jl0lncl0y1zrw1y5gvbq0cgdplqp"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4863,12 +4863,12 @@ let vim-hybrid-material = buildVimPluginFrom2Nix { pname = "vim-hybrid-material"; - version = "2018-11-12"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-hybrid-material"; - rev = "f2e92ac7e5c4bb75d72f0abaea939e4364e00e2e"; - sha256 = "01b9n598106qh68ky3fykczq13pldi221r7lrxvg0vnv2zp1z5qd"; + rev = "ad031275c63a05b6acb6014a2401d8719a290bd4"; + sha256 = "0qjg25cfdx9706svw4b527arfdq4ypshay11ak62yswirkvgsc2c"; }; meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/"; }; @@ -5044,12 +5044,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-06-09"; + version = "2020-06-14"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "3b88595805ac7c0499dc05bc8aa5cc7909c6f5b7"; - sha256 = "04yjjcfmaby466krqzmvwg0cb2ydri6pj49x48z15h4s9ac47p66"; + rev = "f541124a50410c39b1534a098600a20a7ad0661f"; + sha256 = "1ldk9gh6k2qmdiy4am3rl63pkywk221lz4c4wbwp6kzs0imlhb7f"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5224,12 +5224,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-06-10"; + version = "2020-06-15"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "b34ad0fdd1223e5c1c39d23c01f13954ca2ad500"; - sha256 = "1zqk0zimq2qyqhhfb5693zkcxz16vyrd7k2wd488avqi1jbhiffc"; + rev = "632cd869663ecccd5a309c5dbfc20e1fc881d4b7"; + sha256 = "0w04fjci16l08c76fgqxv176jarm9iiv3rx46l8a45spkyb10lm0"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; @@ -5260,12 +5260,12 @@ let vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2019-07-09"; + version = "2020-06-16"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "da5a7ac96f517e0fd6f886bc3fbe27156ca1f946"; - sha256 = "198bsv88njz6l2pf9yjxb8292aj7x8n2sxi50q3cdsg29a3y2i5c"; + rev = "c179316755bccb44115d031d720037dc58d75e6c"; + sha256 = "0ljvlh3glylm9q9fkdq6162i4jsxgyik13wcyjg44vrsgdim02qa"; }; meta.homepage = "https://github.com/plasticboy/vim-markdown/"; }; @@ -5668,12 +5668,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-06-13"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "a86c0179ebc99b15d403e3f1d4a4cfff83b47de8"; - sha256 = "0bsq2nvzxb6j0zn6c9hvrsz47ahcp3iki5acz4l1y841xgd880zm"; + rev = "8b6c06e7239eb46d5b5096fd7fe9507aca88b091"; + sha256 = "1j4fg0xhnwk0hf89djv0l2gzrj5dna1a9g8vjdxgdq0pilz5hqnj"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -5800,12 +5800,12 @@ let vim-racer = buildVimPluginFrom2Nix { pname = "vim-racer"; - version = "2020-03-06"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "racer-rust"; repo = "vim-racer"; - rev = "950b78f36e568134f5dcabc9a146c61e0084d220"; - sha256 = "0k62yybilh2052w6zfscw7daz7y1qnqv1311zngjim5z8xmp7j1l"; + rev = "250e9fd496edde1516a5e68e9837ccf5e46cc895"; + sha256 = "1ar5wv776xslxrs2mmxr5kzz5pp4a4v8jydh9s6cqbfzglgr9kw5"; }; meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; @@ -6232,12 +6232,12 @@ let vim-SyntaxRange = buildVimPluginFrom2Nix { pname = "vim-SyntaxRange"; - version = "2020-05-09"; + version = "2020-06-17"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-SyntaxRange"; - rev = "35d116cd1c70d2066b332a76ddbf354786cbb996"; - sha256 = "0mxih2ixaqnzh915w8zycdjxf07ax648dw5nvglcp7ym4r8fzg0q"; + rev = "63c382eabfb5dd0b1e837dc6a42b14f3fe000ff9"; + sha256 = "1c62m2k08vnla3zd3rb716y6vp5ijn8b36fv48jw77y579k9l6pk"; }; meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; @@ -6532,12 +6532,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-06-08"; + version = "2020-06-14"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "f972b5357af0e5c9b840f8e82eceb313891ef8b2"; - sha256 = "0ngvl4ikd45d1nhfpnpp003mfwx9mv5ywgk9mi5fjn2bc9a2y4l7"; + rev = "507c498c7dac31c396ed64bfddcd92551a93669d"; + sha256 = "0jq1ywz4fwlln93qwwxl28dlq43c5vaybhi1y365hcn03nz526cc"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6592,12 +6592,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-06-10"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "dffbb044f7974bf4615960689a3ff64e63daeab3"; - sha256 = "0ggnz2bz6mh9i38cgpkf87j27bhr8klk9a4ws57rkwfz3qppd4lj"; + rev = "b9409149a5a8a386322cc4246d890c8c4c07d11d"; + sha256 = "0jrz1v63a9kv7bkksdw7vxq83d49f0dvhp1sd9vaiya7a93raxdx"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -6832,12 +6832,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-06-06"; + version = "2020-06-19"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "bfd70f620d30dc756d8ae57056b7a67a3fbbff22"; - sha256 = "1a60qbswwdl58pqg6d9llj4l96h9vz7vp99s7ji0zjg8vzzklyxm"; + rev = "4465a93001fe2f7800569f63257446114d347a5b"; + sha256 = "1vhi7zqywk15yzigky9nhsgjcjn9qvnpfgdw8173bsxh260bf33k"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -6952,12 +6952,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-05-15"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "fbbb4b2fa346f556aee8424c98ee51e849949bb1"; - sha256 = "1plgig0m7zb4zk7mqj5g12nc622dpngj4g4wvkg2ffic2krz9fdx"; + rev = "7f4e88b3ba11261e6ec4c7364c5a420d48e253ac"; + sha256 = "1q98pf0cr38k1z9czm57pvb0mari57q89swsk4aq0pl6b6cvi5d5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -6965,12 +6965,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-06-12"; + version = "2020-06-14"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "8bc02ee4877bfe07ed92cc4d471c353f1ab84ef6"; - sha256 = "1m1qhyqax7pdrsw9zdwy64d8rg5hcvmbyl8fqmbhz22lxdg5bvzv"; + rev = "f9906f804b02e6b7e70a7f1a6f949e905784b5b9"; + sha256 = "0jg5g2yzaf4xs14phak7k1s5s7jfnsx5ijjgx2arddgaxbvpxlrs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7014,12 +7014,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-05-21"; + version = "2020-06-18"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "912e9c792702519ca03cd3e3048e8d276a5d3947"; - sha256 = "1svy3bp8rhcbimcp5p4crz57fiv1p2xvcr4xs90frsncq1r483q9"; + rev = "fdc73a51d168677ec9a1da68afbe30c8ddb6263a"; + sha256 = "14qkrlh07qg6192m2lgbjh3dshgrlbwni2i00vm04xax8dm436j1"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; From f2b38145c06901e1c73c7e0fae48e464864f44ea Mon Sep 17 00:00:00 2001 From: Shi Han NG Date: Sat, 20 Jun 2020 19:30:59 +0900 Subject: [PATCH 363/624] vimPlugins.gotests-vim: init at 2019-04-10 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f8d2cf01c9da..324b6bfde811 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1630,6 +1630,18 @@ let meta.homepage = "https://github.com/gregsexton/gitv/"; }; + gotests-vim = buildVimPluginFrom2Nix { + pname = "gotests-vim"; + version = "2019-04-10"; + src = fetchFromGitHub { + owner = "buoto"; + repo = "gotests-vim"; + rev = "e0ad687be26875153ecd43d16db3b93a637394e4"; + sha256 = "01w981v7rya9fnxwdhlka4vfzlnw87pxmfcqmvxh3p96lmi71xjm"; + }; + meta.homepage = "https://github.com/buoto/gotests-vim/"; + }; + goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; version = "2020-06-08"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e22ddc50ddd1..516ac691bc28 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -35,6 +35,7 @@ bohlender/vim-smt2 brennanfee/vim-gui-position bronson/vim-trailing-whitespace brooth/far.vim +buoto/gotests-vim carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml From 4f2d6deee66f19b0c4904dc0f4d2d553758de876 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 20 Jun 2020 08:42:30 -0500 Subject: [PATCH 364/624] trellis: 2020.03.25 -> 2020.06.12 Signed-off-by: Austin Seipp --- pkgs/development/tools/trellis/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 132492735649..49484032ffb1 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,18 +8,18 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.03.25"; + version = "2020.06.12"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-152-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-168-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "c27bfc220a9f85f04173840d1ea081ba478adc9c"; - sha256 = "1fyl51246ns2njvij8g7k9a9axvhz8n8g09fny5dym9q7hcx08qh"; + rev = "5c9f6ad076da75ea925def4297c528058d9bf54a"; + sha256 = "1iwpfkibnb9a5kkw5wxyl1fpw1a72pf2icnp1c6sazrphiz8dbf7"; name = "trellis"; }) From 45400f350484413993b111c634603deed7c5cd92 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 20 Jun 2020 08:48:10 -0500 Subject: [PATCH 365/624] icestorm: 2019.09.13 -> 2020.04.22 Signed-off-by: Austin Seipp --- pkgs/development/tools/icestorm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 607e2ffe4a96..360f1dbdcf3e 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "icestorm"; - version = "2019.09.13"; + version = "2020.04.22"; passthru = rec { pythonPkg = if usePyPy then pypy3 else python3; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "0ec00d892a91cc68e45479b46161f649caea2933"; - sha256 = "1qlh99fafb7xga702k64fmc9m700nsddrfgcq4x8qn8fplsb64f1"; + rev = "cd2610e0fa1c6a90e8e4e4cfe06db1b474e752bb"; + sha256 = "05ckmmvgymr7vhrpnqsiafwm8z5rhc3h91v506lzi6jpjzcs23hj"; }; nativeBuildInputs = [ pkgconfig ]; From 4891facdd4a7ce33a7a2199b601fe5eb5db3941b Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 20 Jun 2020 09:42:59 -0500 Subject: [PATCH 366/624] nextpnr: 2020.03.25 -> 2020.06.12 Signed-off-by: Austin Seipp --- pkgs/development/compilers/nextpnr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index cce22207a360..16470f168273 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.03.25"; + version = "2020.06.12"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "a3ede0293a50c910e7d96319b2084d50f2501a6b"; - sha256 = "0ikfjva4gqmlx6y7mjamg03ad7x9gnz32ahqv798ynd87svq10aq"; + rev = "c9e7d1448eaa4644d18073316e30586f2cb1d75a"; + sha256 = "13jyg9d8q9xs1gpb8mz315hcyi3npr4kbfi31x2laz4zmki6ibai"; name = "nextpnr"; }) (fetchFromGitHub { From 2c91b4358afab290a9e0e5a0b03deece03551dfd Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 20 Jun 2020 09:46:30 -0500 Subject: [PATCH 367/624] yosys: 2020.06.16 -> 2020.06.19 Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 09e51e4c6471..1ac34c243156 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.06.16"; + version = "2020.06.19"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "39ba90a8b84d740b670a9f1df5148b824d441c63"; - sha256 = "1ncscbhyq4f07d28l32j37y5d84vyqxfx0fbzhb7nzfhplk8hh0s"; + rev = "338ecbe02f8bb3cc4d69de1445c7f398a814b4e4"; + sha256 = "0j5jwyxrq8rmwpyyidid6yp6g5bq7jwnhmn2ycj82kdj787p9vvs"; }; enableParallelBuilding = true; From f805871a51c6b9ef50d2860c8c08b57d293f0740 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Mon, 11 May 2020 23:11:37 +0200 Subject: [PATCH 368/624] lxqt.pcmanfm-qt: fix default wallpaper --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index f5a5b18cfc05..b656f8371a6c 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -42,6 +42,10 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + postPatch = '' + substituteInPlace config/pcmanfm-qt/lxqt/settings.conf.in --replace @LXQT_SHARE_DIR@ /run/current-system/sw/share/lxqt + ''; + meta = with lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = "https://github.com/lxqt/pcmanfm-qt"; From dbb5bdfa09eb4ecfce1b06a2a7e647ca13fa16c2 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 19 Jun 2020 18:18:10 -0400 Subject: [PATCH 369/624] nixos/resilio: listen on [::1] by default --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ nixos/modules/services/networking/resilio.nix | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 9bbbecc05692..864b4ab62264 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -490,6 +490,11 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; #89205. + + + In the resilio module, has been changed to listen to [::1] instead of 0.0.0.0. + + diff --git a/nixos/modules/services/networking/resilio.nix b/nixos/modules/services/networking/resilio.nix index e74e03fc0b07..f90fa3163e3f 100644 --- a/nixos/modules/services/networking/resilio.nix +++ b/nixos/modules/services/networking/resilio.nix @@ -109,8 +109,8 @@ in httpListenAddr = mkOption { type = types.str; - default = "0.0.0.0"; - example = "1.2.3.4"; + default = "[::1]"; + example = "0.0.0.0"; description = '' HTTP address to bind to. ''; From e6b1c9b1b456124f0789197b17923e42b5dd9622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 20 Jun 2020 11:09:18 +0200 Subject: [PATCH 370/624] python3Packages.thinc: relax catalogue, plac, and srsly constraints Also add an import check. --- pkgs/development/python-modules/thinc/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index e47e17094af3..b32b996ffd6f 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -58,10 +58,19 @@ buildPythonPackage rec { # Cannot find cython modules. doCheck = false; + postPatch = '' + substituteInPlace setup.py \ + --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ + --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ + --replace "srsly>=0.0.6,<1.1.0" "srsly>=0.0.6,<3.0" + ''; + checkPhase = '' pytest thinc/tests ''; + pythonImportsCheck = [ "thinc" ]; + meta = with stdenv.lib; { description = "Practical Machine Learning for NLP in Python"; homepage = "https://github.com/explosion/thinc"; From 916330f28edaf53b0e6c9f44a5eabe3ab31c6be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 20 Jun 2020 11:26:36 +0200 Subject: [PATCH 371/624] python3Packages.spacy: relax catalogue, plac, and srsly versions Also add an import check. --- pkgs/development/python-modules/spacy/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index f0a143ec30c7..51b04d372c5e 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -54,9 +54,15 @@ buildPythonPackage rec { # ''; postPatch = '' - substituteInPlace setup.cfg --replace "thinc==7.4.1" "thinc>=7.4.1,<8" + substituteInPlace setup.cfg \ + --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ + --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ + --replace "srsly>=1.0.2,<1.1.0" "srsly>=1.0.2,<3.0" \ + --replace "thinc==7.4.1" "thinc>=7.4.1,<8" ''; + pythonImportsCheck = [ "spacy" ]; + meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = "https://github.com/explosion/spaCy"; From be79367b2566d88292e3cf754bb0aa0f20e060cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 20 Jun 2020 13:38:17 +0200 Subject: [PATCH 372/624] python2Packages.catalogue: remove --- .../python-modules/catalogue/1.nix | 24 ------------------- .../python-modules/catalogue/default.nix | 3 +++ pkgs/top-level/python-packages.nix | 5 +--- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/python-modules/catalogue/1.nix diff --git a/pkgs/development/python-modules/catalogue/1.nix b/pkgs/development/python-modules/catalogue/1.nix deleted file mode 100644 index 9376377e9c77..000000000000 --- a/pkgs/development/python-modules/catalogue/1.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, importlib-metadata -}: - -buildPythonPackage rec { - pname = "catalogue"; - version = "1.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "d74d1d856c6b36a37bf14aa6dbbc27d0582667b7ab979a6108e61a575e8723f5"; - }; - - propagatedBuildInputs = [ importlib-metadata ]; - - meta = with stdenv.lib; { - description = "Tiny library for adding function or object registries"; - homepage = "https://github.com/explosion/catalogue"; - license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; - }; -} \ No newline at end of file diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 0697a4e61179..eb1aec37c634 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, pythonOlder , importlib-metadata }: @@ -8,6 +9,8 @@ buildPythonPackage rec { pname = "catalogue"; version = "2.0.0"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; sha256 = "34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ecba8ceb468..71f0ed9d2b7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -569,10 +569,7 @@ in { cadquery = callPackage ../development/python-modules/cadquery { }; - catalogue = if isPy3k then - callPackage ../development/python-modules/catalogue { } - else - callPackage ../development/python-modules/catalogue/1.nix { }; + catalogue = callPackage ../development/python-modules/catalogue { }; cbeams = callPackage ../misc/cbeams { }; From 49f5b51ee3a60e749a891987157d784b0109656b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 10:12:21 -0700 Subject: [PATCH 373/624] python3Packages.pylibgen: remove, upstream unmaintained --- .../python-modules/pylibgen/default.nix | 33 ------------------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/development/python-modules/pylibgen/default.nix diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix deleted file mode 100644 index 9dc6689e9000..000000000000 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pythonOlder -, requests -, pytest -, pre-commit -}: - -buildPythonPackage rec { - pname = "pylibgen"; - version = "2.0.2"; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "joshuarli"; - repo = pname; - rev = "v${version}"; - sha256 = "1a9vhkgnkiwkicr2s287254mrkpnw9jq5r63q820dp3h74ba4kl1"; - }; - - propagatedBuildInputs = [ requests ]; - - checkInputs = [ pytest pre-commit ]; - - # literally every tests does a network call - doCheck = false; - - meta = with lib; { - description = "Python interface to Library Genesis"; - homepage = "https://pypi.org/project/pylibgen/"; - license = licenses.mit; - maintainers = [ maintainers.nico202 ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ecba8ceb468..7b54ed711e2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5484,7 +5484,7 @@ in { pylibacl = callPackage ../development/python-modules/pylibacl { }; - pylibgen = callPackage ../development/python-modules/pylibgen { }; + pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pyliblo = callPackage ../development/python-modules/pyliblo { }; From 011dd501232e4d3dccb960fc98cc08eeffc154a1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 10:27:49 -0700 Subject: [PATCH 374/624] python3Packages.papis: 0.9 -> 0.10, fix build --- .../python-modules/papis/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index fbfb72bb8a09..a97c075d30f6 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -1,9 +1,9 @@ { lib, buildPythonPackage, fetchFromGitHub, xdg_utils , requests, filetype, pyparsing, configparser, arxiv2bib , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser -, pylibgen, click, python-slugify, habanero, isbnlib +, click, python-slugify, habanero, isbnlib, typing-extensions , prompt_toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pythonOlder +, python-doi, isPy3k, pythonOlder, pytestcov #, optional, dependencies , whoosh, pytest , stdenv @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "papis"; - version = "0.9"; + version = "0.10"; disabled = !isPy3k; # Missing tests on Pypi @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "15i79q6nr7gcpcafdz5797axmp6r3081sys07k1k2vi5b2g3qc4k"; + sha256 = "0fmrvxs6ixfwjlp96b69db7fpvyqfy2n3c23kdz8yr0vhnp82l93"; }; propagatedBuildInputs = [ requests filetype pyparsing configparser arxiv2bib pyyaml chardet beautifulsoup4 colorama bibtexparser - pylibgen click python-slugify habanero isbnlib - prompt_toolkit pygments + click python-slugify habanero isbnlib + prompt_toolkit pygments typing-extensions stevedore tqdm lxml python-doi # optional dependencies @@ -36,6 +36,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "lxml<=4.3.5" "lxml~=4.3" \ + --replace "isbnlib>=3.9.1,<3.10" "isbnlib~=3.9" \ --replace "python-slugify>=1.2.6,<4" "python-slugify" ''; @@ -43,7 +44,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin && pythonOlder "3.8"; checkInputs = ([ - pytest + pytest pytestcov ]) ++ [ xdg_utils ]; @@ -54,7 +55,7 @@ buildPythonPackage rec { checkPhase = '' HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \ -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url \ - and not test_validate_arxivid and not test_downloader_getter" + and not test_validate_arxivid and not test_downloader_getter and not match" ''; meta = { From 44a837d0560a46de4e9500a6c9c1e2fad9b55498 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 20 Jun 2020 15:30:08 -0400 Subject: [PATCH 375/624] broot: 0.15.1 -> 0.16.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 554d7f9e1dd3..d0cf1b4e5b8b 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1ggzx4w69fmvaxm5gfqhh8ncr2mdx528zm6vwrrwz165lga2fvw6"; + sha256 = "1vhwv9yb8acz4iq9zmg1qkf072z1py84lz4ddj8gmg6rq7g8n4mb"; }; - cargoSha256 = "0gcq0fww9hl3avh3qcnpnwmpwda4cymr7x3kd3frdizrs8i643mr"; + cargoSha256 = "19z6d72ssqwm8i7bnfqgsndy1f2wxzkvhs8swy16gnqfqjqdf26d"; nativeBuildInputs = [ installShellFiles ]; From ee52567e4c2e9a632d0bd8180d077c4bf113250e Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 6 Jun 2020 12:00:00 +0000 Subject: [PATCH 376/624] python3Packages.peewee: 3.11.2 -> 3.13.3 tests don't pass without psycopg2 support: Exception: Your version of psycopg2 does not support JSON. --- pkgs/development/python-modules/peewee/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 3cc5c3eec496..ee3d08a173c3 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.11.2"; + version = "3.13.3"; # pypi release does not provide tests src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "097cafqgk46bf0innwm7xnmsfs6z37hv3alyvrfz6d0iy4scshm5"; + sha256 = "1r67hxb9m6v0xbnbqfnsw6dahmdr94pf81b4x51jfw6x9sa4izi4"; }; @@ -38,6 +38,8 @@ buildPythonPackage rec { ] ++ (lib.optional withPostgres psycopg2) ++ (lib.optional withMysql mysql-connector); + doCheck = withPostgres; + meta = with stdenv.lib;{ description = "a small, expressive orm"; homepage = "http://peewee-orm.com"; From 6345050746df31664f6b94295bd7a778df19bd9b Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 6 Jun 2020 12:00:00 +0000 Subject: [PATCH 377/624] pantalaimon: 0.6.1 -> 0.6.3 --- .../networking/instant-messengers/pantalaimon/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index faf4e4069354..be7a8725df15 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, + setuptools, pytest, faker, pytest-aiohttp, aioresponses, @@ -9,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.6.1"; + version = "0.6.3"; disabled = pythonOlder "3.6"; @@ -18,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0hn3731jh6xwyjayzdf41skhpdx002qs7n5l7ffh4dplhnv9vbxx"; + sha256 = "1h1z701sj1qgcqlsk3pnzifnbcg9fshl7v6271h9x54hm3d6hg8a"; }; propagatedBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonApplication rec { matrix-nio peewee prompt_toolkit + setuptools ] ++ lib.optional enableDbusUi [ dbus-python notify2 From dee55848fefeab2e7e99e52d6648c57517994168 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Mon, 15 Jun 2020 20:19:48 +0200 Subject: [PATCH 378/624] python3Packages.aioresponses: disable test requiring networking --- pkgs/development/python-modules/aioresponses/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 9034e6a67316..7b12cefc8c78 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # Skip a test which makes requests to httpbin.org checkPhase = '' - pytest -k "not test_address_as_instance_of_url_combined_with_pass_through" + pytest -k "not (test_address_as_instance_of_url_combined_with_pass_through or test_pass_through_with_origin_params)" ''; meta = { From f0d4f5f842e0b8feddc4e096bc2aea7d6f7a8298 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 22:30:42 +0200 Subject: [PATCH 379/624] thunderbird-bin: drop GStreamer dependency It has not been used since 2015: https://github.com/mozilla/gecko-dev/commit/42c92612f470f15617b13b29cc77c6ec9094350f --- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index e9217c84fc69..7c0e75685ecf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -13,8 +13,6 @@ , gdk-pixbuf , glib , glibc -, gst-plugins-base -, gstreamer , gtk2 , gtk3 , kerberos @@ -96,8 +94,6 @@ stdenv.mkDerivation { gdk-pixbuf glib glibc - gst-plugins-base - gstreamer gtk2 gtk3 kerberos From a22a20cb40a2fd5c5c3ec9a06def48ba611294ad Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 22:35:04 +0200 Subject: [PATCH 380/624] thunderbird-bin: remove GConf dependency It is only optionally dlopened by crash reporter to try to get system proxy settings but no system stores proxy in GConf these days so it is completely useless. https://github.com/mozilla/gecko-dev/blob/97c590ed5532a7b382b5b8500c109de8f1d831e3/toolkit/crashreporter/client/crashreporter_gtk_common.cpp#L121-L122 --- .../networking/mailreaders/thunderbird-bin/default.nix | 2 -- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 7c0e75685ecf..771128058601 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, config, makeWrapper -, gconf , alsaLib , at-spi2-atk , atk @@ -80,7 +79,6 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc - gconf alsaLib at-spi2-atk atk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0797a7efe5..26bf33e86237 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22445,7 +22445,6 @@ in thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - gconf = pkgs.gnome2.GConf; inherit (pkgs.gnome2) libgnome libgnomeui; }; From 1cbcbbecc205c2393114bb599057d48aa9df2885 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 22:41:19 +0200 Subject: [PATCH 381/624] thunderbird-bin: do not depend on libcanberra-gtk libxul only needs libcanberra.so.0 https://github.com/mozilla/gecko-dev/blob/3dc26ddcf361bd2fd82f6ccd97999adede522a23/widget/gtk/nsSound.cpp#L158 --- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 771128058601..f5ba2f72dc43 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -27,7 +27,7 @@ , libXrender , libXt , libxcb -, libcanberra-gtk2 +, libcanberra , libgnome , libgnomeui , gnome3 @@ -107,7 +107,7 @@ stdenv.mkDerivation { libXrender libXt libxcb - libcanberra-gtk2 + libcanberra libgnome libgnomeui libGLU libGL From 3dd5efc40b85cface4089ef80abdb0424ef7bd52 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 22:46:14 +0200 Subject: [PATCH 382/624] thunderbird-bin: remove libgnome dependency It is deprecated and has been removed ages ago: https://bugzilla.mozilla.org/show_bug.cgi?id=694570 It persists in the crash reporter for some reason but it is optional there: https://github.com/mozilla/gecko-dev/blob/f66f5a235e7d74c29b951316f73001126a056734/toolkit/crashreporter/client/crashreporter_linux.cpp#L366-L370 --- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f5ba2f72dc43..ba13d666ad97 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -28,8 +28,6 @@ , libXt , libxcb , libcanberra -, libgnome -, libgnomeui , gnome3 , libGLU, libGL , nspr @@ -108,8 +106,6 @@ stdenv.mkDerivation { libXt libxcb libcanberra - libgnome - libgnomeui libGLU libGL nspr nss diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26bf33e86237..94a39c2ece3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22444,9 +22444,7 @@ in thunderbolt = callPackage ../os-specific/linux/thunderbolt {}; - thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - inherit (pkgs.gnome2) libgnome libgnomeui; - }; + thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { }; ticpp = callPackage ../development/libraries/ticpp { }; From 5b3a626ab98449d0ca7866af12cb2958862bca7c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:22:55 +0200 Subject: [PATCH 383/624] thunderbird: remove libIDL dependency It has not been used for ages: https://bugzilla.mozilla.org/show_bug.cgi?id=687766 --- .../applications/networking/mailreaders/thunderbird/default.nix | 2 -- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 73536ae5fc1b..e9ae6696def9 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -18,7 +18,6 @@ , lib , libGL , libGLU -, libIDL , libevent , libjpeg , libnotify @@ -113,7 +112,6 @@ stdenv.mkDerivation rec { jemalloc libGL libGLU - libIDL libevent libjpeg libnotify diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94a39c2ece3b..27052d6217d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22436,7 +22436,6 @@ in thonny = callPackage ../applications/editors/thonny { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (gnome2) libIDL; inherit (rustPackages_1_42) rustc; libpng = libpng_apng; gtk3Support = true; From 987a5c1e1473a25f84e54949d81592c4cadd9396 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:33:39 +0200 Subject: [PATCH 384/624] firefox: remove libIDL dependency It has not been used for ages: https://bugzilla.mozilla.org/show_bug.cgi?id=687766 --- pkgs/applications/networking/browsers/firefox/common.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 8060895a2e0f..0eda0739eab1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -2,7 +2,7 @@ , src, unpackPhase ? null, patches ? [] , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: -{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU, libGL, sqlite, unzip, makeWrapper @@ -104,7 +104,7 @@ stdenv.mkDerivation ({ patchFlags = [ "-p1" "-l" ]; buildInputs = [ - gtk2 perl zip libIDL libjpeg zlib bzip2 + gtk2 perl zip libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file libnotify xorg.pixman yasm libGLU libGL diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27052d6217d5..c4ac9ac1935d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19740,7 +19740,6 @@ in firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { callPackage = pkgs.newScope { - inherit (gnome2) libIDL; libpng = libpng_apng; python = python2; gnused = gnused_422; From 5384ace0c8c4ca5292bc38abb156d958b06bae53 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:34:54 +0200 Subject: [PATCH 385/624] firefox-bin: do not depend on libcanberra-gtk libxul only needs libcanberra.so.0 https://github.com/mozilla/gecko-dev/blob/3dc26ddcf361bd2fd82f6ccd97999adede522a23/widget/gtk/nsSound.cpp#L158 --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 27eba126de9e..127bb5120c02 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -27,7 +27,7 @@ , libXinerama , libXrender , libXt -, libcanberra-gtk2 +, libcanberra , libgnome , libgnomeui , libnotify @@ -122,7 +122,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra-gtk2 + libcanberra libgnome libgnomeui libnotify From a699dd2bee1f7ee72d6a53fae9d39175a7c80251 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:37:15 +0200 Subject: [PATCH 386/624] firefox-bin: remove libgnome dependency It is deprecated and has been removed ages ago: https://bugzilla.mozilla.org/show_bug.cgi?id=694570 It persists in the crash reporter for some reason but it is optional there: https://github.com/mozilla/gecko-dev/blob/f66f5a235e7d74c29b951316f73001126a056734/toolkit/crashreporter/client/crashreporter_linux.cpp#L366-L370 --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 127bb5120c02..6cf778c56a98 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,8 +28,6 @@ , libXrender , libXt , libcanberra -, libgnome -, libgnomeui , libnotify , gnome3 , libGLU, libGL @@ -123,8 +121,6 @@ stdenv.mkDerivation { libXrender libXt libcanberra - libgnome - libgnomeui libnotify libGLU libGL nspr diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4ac9ac1935d..41e9c531d032 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19761,7 +19761,6 @@ in channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -19774,7 +19773,6 @@ in channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -19787,7 +19785,6 @@ in channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; gconf = pkgs.gnome2.GConf; - inherit (pkgs.gnome2) libgnome libgnomeui; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { From eb700f7a9315c4a3e78eb58aae9f49b1e10040dd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 20 Jun 2020 23:38:08 +0200 Subject: [PATCH 387/624] firefox-bin: remove GConf dependency It is only optionally dlopened by crash reporter to try to get system proxy settings but no system stores proxy in GConf these days so it is completely useless. https://github.com/mozilla/gecko-dev/blob/97c590ed5532a7b382b5b8500c109de8f1d831e3/toolkit/crashreporter/client/crashreporter_gtk_common.cpp#L121-L122 --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 -- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6cf778c56a98..cb442f673598 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -8,7 +8,6 @@ , dbus , fontconfig , freetype -, gconf , gdk-pixbuf , glib , glibc @@ -101,7 +100,6 @@ stdenv.mkDerivation { dbus fontconfig freetype - gconf gdk-pixbuf glib glibc diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41e9c531d032..d745fe9b9795 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19760,7 +19760,6 @@ in firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; - gconf = pkgs.gnome2.GConf; }; firefox-bin = wrapFirefox firefox-bin-unwrapped { @@ -19772,7 +19771,6 @@ in firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; - gconf = pkgs.gnome2.GConf; }; firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { @@ -19784,7 +19782,6 @@ in firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; - gconf = pkgs.gnome2.GConf; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { From a9422ba768f5c1a18866c778015610a1ca8c09eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Jun 2020 22:45:32 +0200 Subject: [PATCH 388/624] beets: fix werkzeug testcases Closes #91131 --- pkgs/tools/audio/beets/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 662dba65be42..0f73b353169e 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -185,6 +185,11 @@ in pythonPackages.buildPythonApplication rec { ./replaygain-default-bs1770gain.patch ./keyfinder-default-bin.patch ./mutagen-1.43.patch + (fetchpatch { + # Fixes failing testcases around the werkzeug component; can dropped after 1.4.9 + url = "https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8.patch"; + sha256 = "13n2gzmcgfi0m2ycl2r1hpczgksplnkc3y6b66vg57rx5y8nnv5c"; + }) ]; postPatch = '' From 60f0e62b3c397ea34413f78b2a4cb4c7fe60dfd7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Jun 2020 18:27:39 +0200 Subject: [PATCH 389/624] ansible: v2.9.9 -> v2.9.10 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 07ae08ada78c..03bb1fcc3899 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.9"; + version = "2.9.10"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml"; + sha256 = "1979522k57gafvq9vx3lbc3zah7jq3kiy98ji9x5bmxyddmgr9ch"; }; prePatch = '' From 00f7558225d6e12cd59397a213ac8bb2dcd60205 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 20 Jun 2020 20:46:17 -0400 Subject: [PATCH 390/624] Revert "libinput: ensure that we only apply touchpad options to touchpads" This reverts commit 912a58428c71ca73426c25c9d4eac69f119a0517. --- nixos/modules/services/x11/hardware/libinput.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 48543d15499b..9548ecb8ef6d 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -219,7 +219,6 @@ in { Section "InputClass" Identifier "libinputConfiguration" MatchDriver "libinput" - MatchTag "Touchpad" ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Option "AccelProfile" "${cfg.accelProfile}" ${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''} From deeb3fdaed2ba173352c79821569604d10f6f9d5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 21 Jun 2020 10:46:13 +1000 Subject: [PATCH 391/624] fuse-overlayfs: 1.1.0 -> 1.1.1 https://github.com/containers/fuse-overlayfs/releases/tag/v1.1.1 --- pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 46f6bb404ae9..c5b02e1bdb8d 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "0dv62kyc8hvwb4gkhyxzwagp87nv0mr1612dz6q835is1vqav134"; + sha256 = "0zrxq0s3dlgjarn8l519czwffp2s5ibykc00vfrpayg547dgj342"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 079de14fd321ada7447a01b363c2b2c9908c67fe Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Jun 2020 00:22:11 +0200 Subject: [PATCH 392/624] nixos/make-ext4-fs: increase fudge factor from 1.03 to 1.10 Turns out, on smaller images (~800MiB uncompressed sdcard image size), the current fudge factor is way too small to even get the system to the phase where it can resize itself. I first tried with 1.05, but it wasn't enough. --- nixos/lib/make-ext4-fs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 627ac324cf57..516fe3fc673c 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -43,7 +43,7 @@ pkgs.stdenv.mkDerivation { # Make a crude approximation of the size of the target image. # If the script starts failing, increase the fudge factors here. numInodes=$(find $storePaths ./files | wc -l) - numDataBlocks=$(du -s -c -B 4096 --apparent-size $storePaths ./files | tail -1 | awk '{ print int($1 * 1.03) }') + numDataBlocks=$(du -s -c -B 4096 --apparent-size $storePaths ./files | tail -1 | awk '{ print int($1 * 1.10) }') bytes=$((2 * 4096 * $numInodes + 4096 * $numDataBlocks)) echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)" From 3415026220fcb10cde4d1a1be0c76ca7c31e2c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Jun 2020 09:00:13 +0100 Subject: [PATCH 393/624] README: include link to nixos-hardware related to https://github.com/NixOS/rfcs/pull/70 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index da38b227b56e..d1187b372805 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ the main ones: * [Nix](https://github.com/NixOS/nix) - the purely functional package manager * [NixOps](https://github.com/NixOS/nixops) - the tool to remotely deploy NixOS machines +* [nixos-hardware](https://github.com/NixOS/nixos-hardware) - NixOS profiles to optimize settings for different hardware * [Nix RFCs](https://github.com/NixOS/rfcs) - the formal process for making substantial changes to the community * [NixOS homepage](https://github.com/NixOS/nixos-homepage) - the [NixOS.org](https://nixos.org) website * [hydra](https://github.com/NixOS/hydra) - our continuous integration system From a4de542abea148a147134bd87bce74ba9902831f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 14 Jun 2020 09:51:33 +0200 Subject: [PATCH 394/624] =?UTF-8?q?coqPackages.coquelicot:=203.0.3=20?= =?UTF-8?q?=E2=86=92=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coquelicot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 2eb3021ada73..e45077f89fdd 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -3,9 +3,9 @@ let param = if stdenv.lib.versionAtLeast coq.coq-version "8.8" then { - version = "3.0.3"; - uid = "38105"; - sha256 = "0y52lqx1jphv6fwf0d702vzprxmfmxggnh1hy3fznxyl4isfpg4j"; + version = "3.1.0"; + uid = "38287"; + sha256 = "07436wkvnq9jyf7wyhp77bpl157s3qhba1ay5xrkxdi26qdf3h14"; } else { version = "3.0.2"; uid = "37523"; @@ -37,7 +37,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } From 43424688db8b30904e8bf8efd077304016bf0340 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Jun 2020 10:25:52 +0200 Subject: [PATCH 395/624] nixos/deviceTree: fix description hardware.deviceTree.base points to a path, not a package (and also if of types.path) It defaults to ${config.boot.kernelPackages.kernel}/dtbs. --- nixos/modules/hardware/device-tree.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix index cf553497c89b..6ae638f17cc9 100644 --- a/nixos/modules/hardware/device-tree.nix +++ b/nixos/modules/hardware/device-tree.nix @@ -22,7 +22,7 @@ in { example = literalExample "pkgs.device-tree_rpi"; type = types.path; description = '' - The package containing the base device-tree (.dtb) to boot. Contains + The path containing the base device-tree (.dtb) to boot. Contains device trees bundled with the Linux kernel by default. ''; }; From c27fc6a5e57e53687881d58c443c29f22f92bc73 Mon Sep 17 00:00:00 2001 From: edef Date: Sun, 21 Jun 2020 08:54:14 +0000 Subject: [PATCH 396/624] nixos/gerrit: allow configuring replication declaratively (#91200) --- nixos/modules/services/web-apps/gerrit.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nixos/modules/services/web-apps/gerrit.nix b/nixos/modules/services/web-apps/gerrit.nix index b184c0754d45..657b1a4fc5ba 100644 --- a/nixos/modules/services/web-apps/gerrit.nix +++ b/nixos/modules/services/web-apps/gerrit.nix @@ -17,6 +17,10 @@ let lib.generators.toGitINI cfg.settings ); + replicationConfig = pkgs.writeText "replication.conf" ( + lib.generators.toGitINI cfg.replicationSettings + ); + # Wrap the gerrit java with all the java options so it can be called # like a normal CLI app gerrit-cli = pkgs.writeShellScriptBin "gerrit" '' @@ -106,6 +110,15 @@ in ''; }; + replicationSettings = mkOption { + type = gitIniType; + default = {}; + description = '' + Replication configuration. This will be generated to the + etc/replication.config file. + ''; + }; + plugins = mkOption { type = types.listOf types.package; default = []; @@ -138,6 +151,13 @@ in config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.replicationSettings != {} -> elem "replication" cfg.builtinPlugins; + message = "Gerrit replicationSettings require enabling the replication plugin"; + } + ]; + services.gerrit.settings = { cache.directory = "/var/cache/gerrit"; container.heapLimit = cfg.jvmHeapLimit; @@ -194,6 +214,7 @@ in # copy the config, keep it mutable because Gerrit ln -sfv ${gerritConfig} etc/gerrit.config + ln -sfv ${replicationConfig} etc/replication.config # install the plugins rm -rf plugins From ab844b28e3aaef29b36ff4c08254c795e0b157e6 Mon Sep 17 00:00:00 2001 From: Pradyuman Vig Date: Sun, 21 Jun 2020 04:00:53 -0500 Subject: [PATCH 397/624] google-cloud-sdk: 286.0.0 -> 297.0.1 (#91202) --- pkgs/tools/admin/google-cloud-sdk/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index fb7870eac956..2ecd9242818a 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,20 +21,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0v83faz0jwnx603acmkc3bsl7vg2xxsm1jfw88fmnj6zcsa5b9ql"; + sha256 = "0imsshvdwd2isq58kplc27za30nabp62ypf1hq95aq94pjm2zp39"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1z9liqzgwfavh3m3q1s871gxnwnsxdbny2vqzh9sjlwdk26f76gi"; + sha256 = "1905rj36md5iszbxw78ylvkljr4d54i50x23r1r6k1xw7i93yfwq"; }; }.${system}; - strip = if stdenv.isDarwin then "strip -x" else "strip"; - in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "286.0.0"; + version = "297.0.1"; src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); @@ -93,9 +91,6 @@ in stdenv.mkDerivation rec { jq -c . $path > $path.min mv $path.min $path done - - # strip the Cython gRPC library - ${strip} $out/google-cloud-sdk/lib/third_party/grpc/_cython/cygrpc.so ''; meta = with stdenv.lib; { From 8dd2327bbd120ed68f37778a6e5b1ed7aedd81ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 20 Jun 2020 12:17:07 +0100 Subject: [PATCH 398/624] home-assistant: add update script --- pkgs/servers/home-assistant/update.sh | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 pkgs/servers/home-assistant/update.sh diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh new file mode 100755 index 000000000000..11189cf3577a --- /dev/null +++ b/pkgs/servers/home-assistant/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix -p jq -p curl -p bash -p git -p nix-update -i bash + +set -eux + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +cd "$DIR" + +CURRENT_VERSION=$(nix eval --raw '(with import ../../.. {}; home-assistant.version)') +TARGET_VERSION=$(curl https://api.github.com/repos/home-assistant/core/releases/latest | jq -r '.name') +MANIFEST=$(curl https://raw.githubusercontent.com/home-assistant/core/${TARGET_VERSION}/homeassistant/components/frontend/manifest.json) +FRONTEND_VERSION=$(echo $MANIFEST | jq -r '.requirements[] | select(startswith("home-assistant-frontend")) | sub(".*==(?.*)"; .vers)') + +if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then + echo "home-assistant is up-to-date: ${CURRENT_VERSION}" + exit 0 +fi + + +sed -i -e "s/version =.*/version = \"${TARGET_VERSION}\";/" \ + component-packages.nix + +sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ + default.nix + +./parse-requirements.py +( + cd ../../.. + nix-update --version "$FRONTEND_VERSION" home-assistant.hass-frontend + nix-update --version "$TARGET_VERSION" --build home-assistant +) + +git add ./component-packages.nix ./default.nix ./frontend.nix +git commit -m "homeassistant: ${CURRENT_VERSION} -> ${TARGET_VERSION}" From a68c7e0fa7dca4107ffe83d21f3c53ba14c5c45f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 20 Jun 2020 11:05:30 +0100 Subject: [PATCH 399/624] nixos/home-assistant: fix tests --- nixos/tests/home-assistant.nix | 119 +++++++++--------------- pkgs/servers/home-assistant/default.nix | 5 +- 2 files changed, 50 insertions(+), 74 deletions(-) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 3365e74ba838..0d1fcedcd857 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -2,69 +2,53 @@ import ./make-test-python.nix ({ pkgs, ... }: let configDir = "/var/lib/foobar"; - apiPassword = "some_secret"; - mqttPassword = "another_secret"; - hassCli = "hass-cli --server http://hass:8123 --password '${apiPassword}'"; + mqttPassword = "secret"; in { name = "home-assistant"; meta = with pkgs.stdenv.lib; { maintainers = with maintainers; [ dotlambda ]; }; - nodes = { - hass = - { pkgs, ... }: - { - environment.systemPackages = with pkgs; [ - mosquitto home-assistant-cli - ]; - services.home-assistant = { - inherit configDir; - enable = true; - package = pkgs.home-assistant.override { - extraPackages = ps: with ps; [ hbmqtt ]; - }; - config = { - homeassistant = { - name = "Home"; - time_zone = "UTC"; - latitude = "0.0"; - longitude = "0.0"; - elevation = 0; - auth_providers = [ - { - type = "legacy_api_password"; - api_password = apiPassword; - } - ]; - }; - frontend = { }; - mqtt = { # Use hbmqtt as broker - password = mqttPassword; - }; - binary_sensor = [ - { - platform = "mqtt"; - state_topic = "home-assistant/test"; - payload_on = "let_there_be_light"; - payload_off = "off"; - } - ]; - }; - lovelaceConfig = { - title = "My Awesome Home"; - views = [ { - title = "Example"; - cards = [ { - type = "markdown"; - title = "Lovelace"; - content = "Welcome to your **Lovelace UI**."; - } ]; - } ]; - }; - lovelaceConfigWritable = true; + nodes.hass = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ mosquitto ]; + services.home-assistant = { + inherit configDir; + enable = true; + config = { + homeassistant = { + name = "Home"; + time_zone = "UTC"; + latitude = "0.0"; + longitude = "0.0"; + elevation = 0; + }; + frontend = {}; + # uses embedded mqtt broker + mqtt.password = mqttPassword; + binary_sensor = [{ + platform = "mqtt"; + state_topic = "home-assistant/test"; + payload_on = "let_there_be_light"; + payload_off = "off"; + }]; + logger = { + default = "info"; + logs."homeassistant.components.mqtt" = "debug"; }; }; + lovelaceConfig = { + title = "My Awesome Home"; + views = [{ + title = "Example"; + cards = [{ + type = "markdown"; + title = "Lovelace"; + content = "Welcome to your **Lovelace UI**."; + }]; + }]; + }; + lovelaceConfigWritable = true; + }; }; testScript = '' @@ -77,28 +61,13 @@ in { with subtest("Check that Home Assistant's web interface and API can be reached"): hass.wait_for_open_port(8123) hass.succeed("curl --fail http://localhost:8123/lovelace") - assert "API running" in hass.succeed( - "curl --fail -H 'x-ha-access: ${apiPassword}' http://localhost:8123/api/" - ) with subtest("Toggle a binary sensor using MQTT"): - assert '"state": "off"' in hass.succeed( - "curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}'" - ) + # wait for broker to become available hass.wait_until_succeeds( - "mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light" - ) - assert '"state": "on"' in hass.succeed( - "curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}'" - ) - with subtest("Toggle a binary sensor using hass-cli"): - assert '"state": "on"' in hass.succeed( - "${hassCli} --output json state get binary_sensor.mqtt_binary_sensor" + "mosquitto_sub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -W 1 -t '*'" ) hass.succeed( - "${hassCli} state edit binary_sensor.mqtt_binary_sensor --json='{\"state\": \"off\"}'" - ) - assert '"state": "off"' in hass.succeed( - "curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}'" + "mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${mqttPassword}' -m let_there_be_light" ) with subtest("Print log to ease debugging"): output_log = hass.succeed("cat ${configDir}/home-assistant.log") @@ -107,5 +76,9 @@ in { with subtest("Check that no errors were logged"): assert "ERROR" not in output_log + + # example line: 2020-06-20 10:01:32 DEBUG (MainThread) [homeassistant.components.mqtt] Received message on home-assistant/test: b'let_there_be_light' + with subtest("Check we received the mosquitto message"): + assert "let_there_be_light" in output_log ''; }) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 27c1a0a75263..366415dd9e2a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ stdenv, nixosTests, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -123,6 +123,9 @@ in with py.pkgs; buildPythonApplication rec { passthru = { inherit (py.pkgs) hass-frontend; + tests = { + inherit (nixosTests) home-assistant; + }; }; meta = with lib; { From 7d436b4618f2675b4b6dd3390f07b16e8506e8da Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 18 Jun 2020 09:57:39 +0200 Subject: [PATCH 400/624] hercules-ci-agent: init at 0.7.2 --- .../configuration-hackage2nix.yaml | 3 +++ .../haskell-modules/configuration-nix.nix | 1 + .../hercules-ci-agent/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 35ee3037d07d..9557d25e272e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2659,6 +2659,9 @@ package-maintainers: - Agda roberth: - arion-compose + - hercules-ci-agent + - hercules-ci-api-core + - hercules-ci-api-agent cdepillabout: - pretty-simple - spago diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9f1bdb147934..342ae157d302 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -96,6 +96,7 @@ self: super: builtins.intersectAttrs super { # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8 cachix = disableLibraryProfiling super.cachix; + hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent; # avoid compiling twice by providing executable as a separate output (with small closure size) niv = enableSeparateBinOutput super.niv; diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix new file mode 100644 index 000000000000..c8316f4bb571 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -0,0 +1,21 @@ +{ gnutar, gzip, git, haskell, haskellPackages, lib, makeWrapper }: +let + inherit (haskell.lib) overrideCabal addBuildDepends; + inherit (lib) makeBinPath; + pkg = + # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 + overrideCabal + (addBuildDepends (haskell.lib.justStaticExecutables haskellPackages.hercules-ci-agent) [ makeWrapper ]) + (o: { + postInstall = '' + ${o.postInstall or ""} + mkdir -p $out/libexec + mv $out/bin/hercules-ci-agent $out/libexec + makeWrapper $out/libexec/hercules-ci-agent $out/bin/hercules-ci-agent --prefix PATH : ${makeBinPath [ gnutar gzip git ]} + ''; + }); +in pkg // { + meta = pkg.meta // { + position = toString ./default.nix + ":1"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39f7770a4da4..0beea93c4856 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11411,6 +11411,8 @@ in # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; + hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; + niv = haskellPackages.niv.bin; ormolu = haskellPackages.ormolu.bin; From 54129e72b4610b80843d86537c15e1ebc06628c9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Jun 2020 11:18:37 +0200 Subject: [PATCH 401/624] nixos/generic-extlinux-compatible: introduce boot.loader.generic-extlinux-compatible.populateCmd This option exposes the builder command used to populate an image, honoring all options except the -c argument. Useful to have for sdImage.populateRootCommands. Special care needs to be taken w.r.t cross - the populate command runs on the host platform, the activation script on the build platform (so the builders differ) --- .../generic-extlinux-compatible/default.nix | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index af39c7bb6841..5ddf96f57909 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -8,7 +8,10 @@ let timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; + # The builder used to write during system activation builder = import ./extlinux-conf-builder.nix { inherit pkgs; }; + # The builder exposed in populateCmd, which runs on the build architecture + populateBuilder = import ./extlinux-conf-builder.nix { pkgs = pkgs.buildPackages; }; in { options = { @@ -34,11 +37,28 @@ in Maximum number of configurations in the boot menu. ''; }; + + populateCmd = mkOption { + type = types.str; + readOnly = true; + description = '' + Contains the builder command used to populate an image, + honoring all options except the -c + argument. + Useful to have for sdImage.populateRootCommands + ''; + }; + }; }; - config = mkIf cfg.enable { - system.build.installBootLoader = "${builder} -g ${toString cfg.configurationLimit} -t ${timeoutStr} -c"; - system.boot.loader.id = "generic-extlinux-compatible"; - }; + config = let + builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}"; + in + mkIf cfg.enable { + system.build.installBootLoader = "${builder} ${builderArgs} -c"; + system.boot.loader.id = "generic-extlinux-compatible"; + + boot.loader.generic-extlinux-compatible.populateCmd = "${populateBuilder} ${builderArgs}"; + }; } From afa627730e6ce0e9743b6ce107cb84a4d6870152 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Jun 2020 10:06:18 +0200 Subject: [PATCH 402/624] nixos/sd-image-*: use boot.loader.generic-extlinux-compatible.populateCmd While getting rid of the separate extlinux-conf-builder import, this now also honors boot.loader.timeout in the initial sd card image if specified. --- nixos/modules/installer/cd-dvd/sd-image-aarch64.nix | 8 +------- .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix | 8 +------- nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix | 8 +------- nixos/modules/installer/cd-dvd/sd-image.nix | 2 +- 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 2d34406a0320..bef6cd2fb5a2 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -2,12 +2,6 @@ # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-aarch64.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: -let - extlinux-conf-builder = - import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; - }; -in { imports = [ ../../profiles/base.nix @@ -56,7 +50,7 @@ in ''; populateRootCommands = '' mkdir -p ./files/boot - ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot + ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot ''; }; diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 651d1a36dc11..d2ba611532e0 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -2,12 +2,6 @@ # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: -let - extlinux-conf-builder = - import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; - }; -in { imports = [ ../../profiles/base.nix @@ -53,7 +47,7 @@ in ''; populateRootCommands = '' mkdir -p ./files/boot - ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot + ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot ''; }; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index ba4127eaa0e8..40a01f961771 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -2,12 +2,6 @@ # nix-build nixos -I nixos-config=nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix -A config.system.build.sdImage { config, lib, pkgs, ... }: -let - extlinux-conf-builder = - import ../../system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.nix { - pkgs = pkgs.buildPackages; - }; -in { imports = [ ../../profiles/base.nix @@ -42,7 +36,7 @@ in ''; populateRootCommands = '' mkdir -p ./files/boot - ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./files/boot + ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot ''; }; diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index c15befa59e26..ddad1116c94a 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -99,7 +99,7 @@ in }; populateRootCommands = mkOption { - example = literalExample "''\${extlinux-conf-builder} -t 3 -c \${config.system.build.toplevel} -d ./files/boot''"; + example = literalExample "''\${config.boot.loader.generic-extlinux-compatible.populateCmd} -c \${config.system.build.toplevel} -d ./files/boot''"; description = '' Shell commands to populate the ./files directory. All files in that directory are copied to the From bd8137aef1a5716e315fdcd8987b22062ffe8eef Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 20 Jun 2020 20:33:18 +0200 Subject: [PATCH 403/624] extlinux-conf-builder.sh: allow a custom FDT to be specified Some bootloaders might not properly detect the model. If the specific model is known by configuration, provide a way to explicitly point to a specific dtb in the extlinux.conf. --- .../extlinux-conf-builder.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh index 0092ee92b62f..854684b87fac 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh @@ -6,7 +6,7 @@ export PATH=/empty for i in @path@; do PATH=$PATH:$i/bin; done usage() { - echo "usage: $0 -t -c [-d ] [-g ]" >&2 + echo "usage: $0 -t -c [-d ] [-g ] [-n ]" >&2 exit 1 } @@ -15,7 +15,7 @@ default= # Default configuration target=/boot # Target directory numGenerations=0 # Number of other generations to include in the menu -while getopts "t:c:d:g:" opt; do +while getopts "t:c:d:g:n:" opt; do case "$opt" in t) # U-Boot interprets '0' as infinite and negative as instant boot if [ "$OPTARG" -lt 0 ]; then @@ -29,6 +29,7 @@ while getopts "t:c:d:g:" opt; do c) default="$OPTARG" ;; d) target="$OPTARG" ;; g) numGenerations="$OPTARG" ;; + n) dtbName="$OPTARG" ;; \?) usage ;; esac done @@ -96,7 +97,17 @@ addEntry() { echo " LINUX ../nixos/$(basename $kernel)" echo " INITRD ../nixos/$(basename $initrd)" if [ -d "$dtbDir" ]; then - echo " FDTDIR ../nixos/$(basename $dtbs)" + # if a dtbName was specified explicitly, use that, else use FDTDIR + if [ -n "$dtbName" ]; then + echo " FDT ../nixos/$(basename $dtbs)/${dtbName}" + else + echo " FDTDIR ../nixos/$(basename $dtbs)" + fi + else + if [ -n "$dtbName" ]; then + echo "Explicitly requested dtbName $dtbName, but there's no FDTDIR - bailing out." >&2 + exit 1 + fi fi echo " APPEND systemConfig=$path init=$path/init $extraParams" } From 387f3b58d2cfe131700a3c40541665c1dfde1bbb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 21 Jun 2020 10:33:09 +0200 Subject: [PATCH 404/624] hardware.deviceTree: add name This can be used to explicitly specify a specific dtb file, relative to the dtb base. Update the generic-extlinux-compatible module to make use of this option. --- nixos/modules/hardware/device-tree.nix | 11 +++++++++++ .../loader/generic-extlinux-compatible/default.nix | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix index 6ae638f17cc9..b3f1dda98c89 100644 --- a/nixos/modules/hardware/device-tree.nix +++ b/nixos/modules/hardware/device-tree.nix @@ -27,6 +27,17 @@ in { ''; }; + name = mkOption { + default = null; + example = "some-dtb.dtb"; + type = types.nullOr types.str; + description = '' + The name of an explicit dtb to be loaded, relative to the dtb base. + Useful in extlinux scenarios if the bootloader doesn't pick the + right .dtb file from FDTDIR. + ''; + }; + overlays = mkOption { default = []; example = literalExample diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index 5ddf96f57909..416f8aeb1d38 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -4,6 +4,7 @@ with lib; let blCfg = config.boot.loader; + dtCfg = config.hardware.deviceTree; cfg = blCfg.generic-extlinux-compatible; timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout; @@ -53,7 +54,7 @@ in }; config = let - builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}"; + builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}" + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}"; in mkIf cfg.enable { system.build.installBootLoader = "${builder} ${builderArgs} -c"; From a64a315151ca0231970bf503ca8d62480bfdac23 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 21 Jun 2020 14:08:25 +0200 Subject: [PATCH 405/624] terminus-font: make build reproducible by using `gzip -n` --- pkgs/data/fonts/terminus-font/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 4c7f5d85e869..fb120e5eec6a 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' + substituteInPlace Makefile --replace 'gzip' 'gzip -n' ''; postBuild = '' From 51273a0f73d7266cc3005e26dfc2622222a1cdbd Mon Sep 17 00:00:00 2001 From: Jonathan Jeppener-Haltenhoff Date: Mon, 1 Jun 2020 15:15:40 +0200 Subject: [PATCH 406/624] maintainers: Add jobojeha --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5329efeab87e..5ee798b334c1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3646,6 +3646,12 @@ githubId = 1102396; name = "Jussi Maki"; }; + jobojeha = { + email = "jobojeha@jeppener.de"; + github = "jobojeha"; + githubId = 60272884; + name = "Jonathan Jeppener-Haltenhoff"; + }; joelburget = { email = "joelburget@gmail.com"; github = "joelburget"; From f6e102fc63d5c2794f37fb02434c2b3a94ff8595 Mon Sep 17 00:00:00 2001 From: Jonathan Jeppener-Haltenhoff Date: Mon, 1 Jun 2020 15:14:31 +0200 Subject: [PATCH 407/624] utf8cpp: init at 3.1.1 --- .../development/libraries/utf8cpp/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/utf8cpp/default.nix diff --git a/pkgs/development/libraries/utf8cpp/default.nix b/pkgs/development/libraries/utf8cpp/default.nix new file mode 100644 index 000000000000..a2aac1241cd8 --- /dev/null +++ b/pkgs/development/libraries/utf8cpp/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "utf8cpp"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "nemtrif"; + repo = "utfcpp"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1s2pda75488z7c3w3a6qv31bj239248696yk5j2a1drbg2x1dpfh"; + }; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=None" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DINSTALL_GTEST=OFF" + ]; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/nemtrif/utfcpp"; + description = "UTF-8 with C++ in a Portable Way"; + license = licenses.free; + maintainers = with maintainers; [ jobojeha ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f6c5dfea4f8..da9962c6b7e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26254,6 +26254,8 @@ in urbit = callPackage ../misc/urbit { }; + utf8cpp = callPackage ../development/libraries/utf8cpp { }; + utf8proc = callPackage ../development/libraries/utf8proc { }; unicode-paracode = callPackage ../tools/misc/unicode { }; From 8acdd6db799d46450af5320d529f0b19f9c9e4c4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 20 Jun 2020 11:53:02 +0300 Subject: [PATCH 408/624] vim_configureable: improve luajit support --- pkgs/applications/editors/vim/configurable.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 3b37c805cdd7..83c8533f5cdf 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -104,6 +104,8 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals luaSupport [ "--with-lua-prefix=${lua}" "--enable-luainterp" + ] ++ stdenv.lib.optional lua.pkgs.isLuaJIT [ + "--with-luajit" ] ++ stdenv.lib.optionals pythonSupport [ "--enable-python${if isPython3 then "3" else ""}interp=yes" From 663abfb1e4492b5d45f29885b21b061174e23101 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Jun 2020 14:57:57 +0200 Subject: [PATCH 409/624] pythonPackages.pymetno: 0.5.0 -> 0.5.1 Fixes requests to the updated API endpoint. --- pkgs/development/python-modules/pymetno/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 129ec21e05ce..1e4b0d2adaef 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "PyMetno"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { repo = pname; owner = "Danielhiversen"; rev = version; - sha256 = "00v2r3nn48svni9rbmbf0a4ylgfcf93gk2wg7qnm1fv1qrkgscvg"; + sha256 = "1ihq1lzgzcxbg916izakx9jp0kp1vdrcdwcwwwsws838wc08ax6m"; }; propagatedBuildInputs = [ aiohttp async-timeout pytz xmltodict ]; From 28d42496f8e90723f56425cf04b1fec28663f08d Mon Sep 17 00:00:00 2001 From: Phillip Cloud Date: Sun, 21 Jun 2020 09:02:40 -0400 Subject: [PATCH 410/624] tracy: 0.6.3 -> 0.7 --- pkgs/development/tools/tracy/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index d446511298fa..93a5554c371d 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,23 +1,23 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { - name = "tracy-${version}"; - version = "0.6.3"; + name = "tracy-${version}"; + version = "0.7"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "0pgq8h5gq141zq1k4cgj6cp74kh4zqbp7h4wh29q4grjb04yy06i"; + sha256 = "07cmz2w7iv10f9i9q3fhg80s6riy9bxnk9xvc3q4lw47mc150skp"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glfw ] + buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] ++ lib.optionals stdenv.isLinux [ gtk2 tbb ]; - NIX_CFLAGS_COMPILE = [] + NIX_CFLAGS_COMPILE = [ ] ++ lib.optional stdenv.isLinux "-ltbb" ++ lib.optional stdenv.cc.isClang "-faligned-allocation"; From f055ae8e4104c4a510273498eb28a7813df827d8 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 21 Jun 2020 13:17:19 +0000 Subject: [PATCH 411/624] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 70 ++++++++++++++--------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 324b6bfde811..828a1fad0001 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-06-19"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "4f254988064d075bd3c2e08038b501df4d07b78d"; - sha256 = "15l3j6g3k4s08dbqnav1gns5vc5bxx2r4db6zw7ray26bxi1f2ch"; + rev = "834d6f9c48ce349a4c3d72e98bd0de81aaa84042"; + sha256 = "0b9606yspjvmfarjmgqcbsg9qp64gkr7b1w7py2gd1fvbmnkmac0"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -405,8 +405,8 @@ let src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "10a6cc172795d3ba6e9ccb8e1e4d4cdeee66956c"; - sha256 = "1ag1j2szb19d7bi8sfpws3whhq8vzg5gbxygr1shif9bf0dlk447"; + rev = "c4af6c2ea44eb630049340becfc6c66ddfb8b01c"; + sha256 = "1s8vlnabkjgzs2l5rwzcx5rfhhr7lszhl7mvk6l53rylc875zmd7"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -797,12 +797,12 @@ let colorizer = buildVimPluginFrom2Nix { pname = "colorizer"; - version = "2018-06-16"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "colorizer"; - rev = "afc1491e5b9c36305ce710bdad2b48f069141183"; - sha256 = "1dpiv9z8h6196acncyjhzd1qa56y17468fpxbfzrx5q2266sajc7"; + rev = "bafd4e98462a4ddeb275d02fa1448b4349e2e50f"; + sha256 = "0j4x8vf3dj2v3jjjxqyhahrbfm99mgqryq2srnik0wbz7v1br2lh"; }; meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; @@ -1293,12 +1293,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-06-18"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "1a49407cf3eff03359de158151be174956b2ccbc"; - sha256 = "10l91wxfm5019qq16ri316dgwv62ngss8xmf9vpv7lxwspzmc806"; + rev = "2a44d0f331c57bc0527bef1c975153c274bd52f6"; + sha256 = "0v61734kh3zz4q2bj1085kydkviycmjv6c45qmsxnvh9vcjz7ip3"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1378,12 +1378,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2020-05-04"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "76285f8ec456a8c0d01ea0fa9d0b757c7eb0bab3"; - sha256 = "1qrqg4kr55hisi5f4qlkj1zvvlgfpby9pyynlb669d8414013f67"; + rev = "dc6cb4fd074f4c371158eeab0c8e4ce4af33534b"; + sha256 = "1cy201c5imbw2pw65f1s0nn8p6vwm00nqlvxwygh18dhy2qv4gfa"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -1548,12 +1548,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-06-07"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "8f1e73b598d27d78dfb5843be19a73b6a3b222b1"; - sha256 = "0zdimx6q2fivimdvh0cnm6w718vjxj0abv67869ijh1d4mfrmvyf"; + rev = "2bf85d25e203a536edb2c072c0d41b29e8e4cc1b"; + sha256 = "0dj6nw7rgc4679vqqmls8f59r3ax1ys4lrq4dq1gby3yk8z7lcy9"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -2101,12 +2101,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-06-19"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "3afa0102cede4687c05b7cb48b2e15beb236602f"; - sha256 = "1qyf0jsh8fgnmq53dbdrkhlivznjki2vx4rmdp9dvv86zn7xr4mb"; + rev = "afd88109a6e24c4cc0cb55ae70ca66c108f1c540"; + sha256 = "1cjb7klyigsqxv827bxdgp22b8cc5wihb1jfk7a8l63skliyqmg2"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -3423,12 +3423,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2020-06-19"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "ac40d8c89b9eba8eefdbb8383eba54ab98c13bd5"; - sha256 = "16alf05qzf572nj7dbw9c2s6vxq2raz2kj61jjvdrcfplr0nqqha"; + rev = "a1eea2431e19e441555442ce41738524042b2493"; + sha256 = "1k8sw8yr9ak4dggd51ishvnljsq3iycrnpfikhzn9h8qgclx2lfl"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -4623,12 +4623,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-06-18"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "97a24e903a7841f410903087c19eaf728668ec81"; - sha256 = "0qhs5dlnjdmlxcq81ycrcr58szwkqc347pdlz9aj60fss1gw49v5"; + rev = "d82f2721424762f14587240e09cfb0dc499779da"; + sha256 = "1ynl6jdnij2hi0gmpgq2b01r5g2db5582jzsqbz079ydb2kbp1jp"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5056,12 +5056,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-06-14"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "f541124a50410c39b1534a098600a20a7ad0661f"; - sha256 = "1ldk9gh6k2qmdiy4am3rl63pkywk221lz4c4wbwp6kzs0imlhb7f"; + rev = "ca3c880f77b4cec6b14d9436b07f4152bebc2712"; + sha256 = "04sq7wips3rybmaqwpxmf7920nv4nrm82lvbr5s9jdn0594lkg9c"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5272,12 +5272,12 @@ let vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2020-06-16"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "c179316755bccb44115d031d720037dc58d75e6c"; - sha256 = "0ljvlh3glylm9q9fkdq6162i4jsxgyik13wcyjg44vrsgdim02qa"; + rev = "139b6f666cd00e2c3180454fb794fd6cee788f0f"; + sha256 = "1yk185l6g5ga2wlbxf0mcwc0dsc6c1nmz1ynl0hfnrbpfnn4sw1p"; }; meta.homepage = "https://github.com/plasticboy/vim-markdown/"; }; @@ -6304,12 +6304,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-06-08"; + version = "2020-06-20"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "2f185e0e5b0e7344c1e391045dc33a2e7a41d8eb"; - sha256 = "1djl6phjc7vzhwbaxsc70mqp1f83iz99bcfyghphs9fhgdg46jiz"; + rev = "a125012ad09d4531dc7f13097fa4a5e3f1ad09a7"; + sha256 = "1dhg81glzfbmcrna45062n41vcfnd7mliphpa6rpd5d9ci54hl08"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; From fbbdc5a27d480e1d0c44b4c3d7cde31f3ba01696 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 21 Jun 2020 13:26:01 +0000 Subject: [PATCH 412/624] vimPlugins.git-messenger-vim: init at 2020-06-08 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 828a1fad0001..3b6ca3b0b8b8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1606,6 +1606,18 @@ let meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; + git-messenger-vim = buildVimPluginFrom2Nix { + pname = "git-messenger-vim"; + version = "2020-06-08"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "git-messenger.vim"; + rev = "0c79022b267f10305cd2d0d3e978c77bcb67b617"; + sha256 = "1657622w60g2xqxalvxjhx9blcppxy69kgn170jb65902x2bav7p"; + }; + meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; + }; + gitignore-vim = buildVimPluginFrom2Nix { pname = "gitignore-vim"; version = "2014-03-16"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 516ac691bc28..15a08782ceba 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -401,6 +401,7 @@ rbgrouleff/bclose.vim reedes/vim-pencil reedes/vim-wordy rhysd/committia.vim +rhysd/git-messenger.vim rhysd/vim-grammarous rhysd/vim-operator-surround rodjek/vim-puppet From f03734efa06c6ca65be597589d68f773aa0d398c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 21 Jun 2020 11:56:50 +0200 Subject: [PATCH 413/624] python3: improve cross-compilation of extension modules, fixes #91171 --- ...tems-not-just-Darwin-set-LDSHARED-if.patch | 33 +++++++++++++++++++ .../interpreters/python/cpython/default.nix | 3 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch diff --git a/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch b/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch new file mode 100644 index 000000000000..0c26300d9c06 --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch @@ -0,0 +1,33 @@ +From 1911995b1a1252d80bf2b9651840e185a1a6baf5 Mon Sep 17 00:00:00 2001 +From: Hong Xu +Date: Thu, 25 Jul 2019 10:25:55 -0700 +Subject: [PATCH] On all posix systems, not just Darwin, set LDSHARED (if not + set) according to CC + +This patch is slightly different from https://bugs.python.org/issue24935 +, except that we now handle LDSHARED according to CC on all posix +systems, not just Darwin or Linux. +--- + Lib/distutils/sysconfig.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 37feae5df7..9fdce6896d 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -199,10 +199,10 @@ def customize_compiler(compiler): + + if 'CC' in os.environ: + newcc = os.environ['CC'] +- if (sys.platform == 'darwin' ++ if (os.name == 'posix' + and 'LDSHARED' not in os.environ + and ldshared.startswith(cc)): +- # On OS X, if CC is overridden, use that as the default ++ # On POSIX systems, if CC is overridden, use that as the default + # command for LDSHARED as well + ldshared = newcc + ldshared[len(cc):] + cc = newcc +-- +2.25.1 + diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 694f661a9669..e6c8b301c0b0 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -140,6 +140,9 @@ in with passthru; stdenv.mkDerivation { sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2"; } ) + ] ++ [ + # LDSHARED now uses $CC instead of gcc. Fixes cross-compilation of extension modules. + ./3.8/0001-On-all-posix-systems-not-just-Darwin-set-LDSHARED-if.patch ]; postPatch = '' From 82f170436d355d82c7e4bbef25fa7b1747b46330 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 21 Jun 2020 16:29:10 +0200 Subject: [PATCH 414/624] btrfs-progs: remove LDSHARED This should no longer be needed with python3 because it's now set correctly in the interpreter. Note that the build currently fails with and without this change. --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 5a6dafae2980..f79dc2396658 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; - # The i686 case is a quick hack; I don't know what's wrong. - postConfigure = stdenv.lib.optionalString (!stdenv.isi686) '' - export LDSHARED="$LD -shared" - ''; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally From f96feeef7cab221539f51ca035926daca1871354 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 20 Jun 2020 13:28:12 +0200 Subject: [PATCH 415/624] kitty: 0.17.4 -> 0.18.0 https://github.com/kovidgoyal/kitty/releases/tag/v0.18.0 I submitted a patch to kitty, so that the library paths can now be passed as arguments to the build system, eliminating the need for patching. This should reduce the required maintenance effort in the future. This commit removes the dependency on `which`, which is no longer necessary since 5e4fe584fab49bfd5d278e513c146b36e76900b5. It was introduced in 481e61fad8b806a48aa30d736344cae4be88dfa6. The configure phase is now ignored because kitty has no configure script. The kitty tests are now run after compilation. The zsh completions no longer need to be invoked with `source` since 38eb73784527587f3fc6df724629b87da66188d0, so remove the outdated comment. There is now a link to the changelog. --- pkgs/applications/misc/kitty/default.nix | 32 +++++++++------- .../misc/kitty/library-paths.patch | 38 ------------------- pkgs/applications/misc/kitty/no-lto.patch | 2 +- 3 files changed, 19 insertions(+), 53 deletions(-) delete mode 100644 pkgs/applications/misc/kitty/library-paths.patch diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 80cf90ced16e..12db0cd87e98 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -3,7 +3,7 @@ libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, installShellFiles, - which, dbus, + dbus, Cocoa, CoreGraphics, Foundation, @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.17.4"; + version = "0.18.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1rbyj84y8r6h7qd6w7cw58v2abspippignj458ihv2m26i4als2x"; + sha256 = "15i4ld65a5rfbaxxdh6kgg9h0ih73iqjskk82h8j72qgzkc6g3hf"; }; buildInputs = [ @@ -50,7 +50,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - pkgconfig which sphinx ncurses + pkgconfig sphinx ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin [ imagemagick libicns # For the png2icns tool. @@ -63,13 +63,6 @@ buildPythonApplication rec { patches = [ ./fix-paths.patch - ] ++ stdenv.lib.optionals stdenv.isLinux [ - (substituteAll { - src = ./library-paths.patch; - libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so"; - libcanberra = "${libcanberra}/lib/libcanberra.so"; - libEGL = "${stdenv.lib.getLib libGL}/lib/libEGL.so.1"; - }) ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-lto.patch ]; @@ -77,11 +70,23 @@ buildPythonApplication rec { # Causes build failure due to warning hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + dontConfigure = true; + buildPhase = if stdenv.isDarwin then '' ${python.interpreter} setup.py kitty.app --update-check-interval=0 make man '' else '' - ${python.interpreter} setup.py linux-package --update-check-interval=0 + ${python.interpreter} setup.py linux-package \ + --update-check-interval=0 \ + --egl-library='${stdenv.lib.getLib libGL}/lib/libEGL.so.1' \ + --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ + --canberra-library='${libcanberra}/lib/libcanberra.so' + ''; + + checkInputs = [ pillow ]; + + checkPhase = '' + ${python.interpreter} test.py ''; installPhase = '' @@ -100,8 +105,6 @@ buildPythonApplication rec { wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" runHook postInstall - # ZSH completions need to be invoked with `source`: - # https://github.com/kovidgoyal/kitty/blob/8ceb941051b89b7c50850778634f0b6137aa5e6e/docs/index.rst#zsh mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish" "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash" @@ -125,6 +128,7 @@ buildPythonApplication rec { homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; + changelog = "https://sw.kovidgoyal.net/kitty/changelog.html"; platforms = platforms.darwin ++ platforms.linux; maintainers = with maintainers; [ tex rvolosatovs ma27 Luflosi ]; }; diff --git a/pkgs/applications/misc/kitty/library-paths.patch b/pkgs/applications/misc/kitty/library-paths.patch deleted file mode 100644 index 608dfb80d61f..000000000000 --- a/pkgs/applications/misc/kitty/library-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/glfw/egl_context.c -+++ b/glfw/egl_context.c -@@ -314,7 +314,7 @@ bool _glfwInitEGL(void) - #elif defined(__CYGWIN__) - "libEGL-1.so", - #else -- "libEGL.so.1", -+ "@libEGL@", - #endif - NULL - }; - ---- a/kitty/desktop.c -+++ b/kitty/desktop.c -@@ -34,10 +34,7 @@ init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) { - done = true; - - const char* libnames[] = { -- "libstartup-notification-1.so", -- // some installs are missing the .so symlink, so try the full name -- "libstartup-notification-1.so.0", -- "libstartup-notification-1.so.0.0.0", -+ "@libstartup_notification@", - NULL - }; - for (int i = 0; libnames[i]; i++) { -@@ -113,10 +110,7 @@ load_libcanberra(void) { - if (done) return; - done = true; - const char* libnames[] = { -- "libcanberra.so", -- // some installs are missing the .so symlink, so try the full name -- "libcanberra.so.0", -- "libcanberra.so.0.2.5", -+ "@libcanberra@", - NULL - }; - for (int i = 0; libnames[i]; i++) { diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch index 8073c11fbd2a..b1f38f9fd49f 100644 --- a/pkgs/applications/misc/kitty/no-lto.patch +++ b/pkgs/applications/misc/kitty/no-lto.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -277,10 +277,6 @@ def init_env( +@@ -287,10 +287,6 @@ def init_env( cppflags += shlex.split(os.environ.get('CPPFLAGS', '')) cflags += shlex.split(os.environ.get('CFLAGS', '')) ldflags += shlex.split(os.environ.get('LDFLAGS', '')) From 37d231adfebe3393540b0d48183f668b96f53c9a Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Sun, 19 Apr 2020 13:07:00 -0600 Subject: [PATCH 416/624] gargoyle: 2018.10.06 -> 2019.01.01 - latest released version - changes: adopt suggestions + more fixes --- pkgs/games/gargoyle/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 8c5675407d0b..c4c512be2b89 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -19,14 +19,15 @@ let in -stdenv.mkDerivation { - name = "gargoyle-2018-10-06"; +stdenv.mkDerivation rec { + pname = "gargoyle"; + version = "2019.1.1"; src = fetchFromGitHub { owner = "garglk"; repo = "garglk"; - rev = "d03391563fa75942fbf8f8deeeacf3a8be9fc3b0"; - sha256 = "0icwgc25gp7krq6zf66hljydc6vps6bb4knywnrfgnfcmcalqqx9"; + rev = version; + sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; }; nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin cctools; From d9068791d9be53a510fcd40f7379ace6fa4a12f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Jun 2020 16:07:30 +0100 Subject: [PATCH 417/624] home-assistant: also collect after_dependencies --- .../home-assistant/component-packages.nix | 72 +++++++++---------- .../home-assistant/parse-requirements.py | 11 +-- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a87c6947a1a1..ddf4886a9174 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -19,7 +19,7 @@ "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ alarmdecoder]; "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors]; + "alexa" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage "amazon_polly" = ps: with ps; [ boto3]; @@ -35,7 +35,7 @@ "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess "api" = ps: with ps; [ aiohttp-cors]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ pyatv]; + "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf]; "apprise" = ps: with ps; [ apprise]; "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic @@ -57,13 +57,13 @@ "aurora" = ps: with ps; [ ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy "auth" = ps: with ps; [ aiohttp-cors]; - "automation" = ps: with ps; [ ]; + "automation" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend "avea" = ps: with ps; [ ]; # missing inputs: avea "avion" = ps: with ps; [ ]; # missing inputs: avion "avri" = ps: with ps; [ ]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore - "axis" = ps: with ps; [ ]; # missing inputs: axis + "axis" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: axis "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub "azure_service_bus" = ps: with ps; [ azure-servicebus]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip @@ -104,7 +104,7 @@ "calendar" = ps: with ps; [ aiohttp-cors]; "camera" = ps: with ps; [ aiohttp-cors]; "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary - "cast" = ps: with ps; [ PyChromecast]; + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -117,7 +117,7 @@ "clicksend" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa]; + "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal @@ -166,7 +166,7 @@ "directv" = ps: with ps; [ ]; # missing inputs: directv "discogs" = ps: with ps; [ discogs_client]; "discord" = ps: with ps; [ discordpy]; - "discovery" = ps: with ps; [ netdisco]; + "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; "dlib_face_detect" = ps: with ps; [ face_recognition]; "dlib_face_identify" = ps: with ps; [ face_recognition]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 @@ -183,10 +183,10 @@ "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd - "dwd_weather_warnings" = ps: with ps; [ ]; + "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ ]; # missing inputs: libpurecool + "dyson" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: libpurecool "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface @@ -263,14 +263,14 @@ "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam "foursquare" = ps: with ps; [ aiohttp-cors]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ ]; # missing inputs: aiofreepybox + "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: aiofreepybox "freedns" = ps: with ps; [ ]; "fritz" = ps: with ps; [ fritzconnection]; "fritzbox" = ps: with ps; [ ]; # missing inputs: pyfritzhome "fritzbox_callmonitor" = ps: with ps; [ fritzconnection]; "fritzbox_netmonitor" = ps: with ps; [ fritzconnection]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "frontend" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip "garadget" = ps: with ps; [ ]; @@ -320,7 +320,7 @@ "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ aioharmony]; - "hassio" = ps: with ps; [ aiohttp-cors]; + "hassio" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -337,7 +337,7 @@ "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg]; # missing inputs: PyTurboJPEG base36 fnvhash + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg sqlalchemy zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash home-assistant-frontend "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip @@ -454,7 +454,7 @@ "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; "manual_mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; - "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "map" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py "matrix" = ps: with ps; [ matrix-client]; @@ -485,7 +485,7 @@ "minio" = ps: with ps; [ minio]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors]; + "mobile_app" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -504,7 +504,7 @@ "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ ]; # missing inputs: pymyq - "mysensors" = ps: with ps; [ ]; # missing inputs: pymysensors + "mysensors" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: pymysensors "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 @@ -516,7 +516,7 @@ "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ ]; # missing inputs: python-nest - "netatmo" = ps: with ps; [ aiohttp-cors pyatmo]; + "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo sqlalchemy]; # missing inputs: home-assistant-frontend "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt @@ -548,7 +548,7 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai - "octoprint" = ps: with ps; [ ]; + "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat "ohmconnect" = ps: with ps; [ defusedxml]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi @@ -577,13 +577,13 @@ "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp]; - "owntracks" = ps: with ps; [ pynacl aiohttp-cors]; - "ozw" = ps: with ps; [ ]; # missing inputs: python-openzwave-mqtt + "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa hbmqtt paho-mqtt sqlalchemy]; # missing inputs: home-assistant-frontend + "ozw" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect]; - "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend - "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "panel_custom" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "panel_iframe" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -598,8 +598,8 @@ "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 "plaato" = ps: with ps; [ aiohttp-cors]; - "plant" = ps: with ps; [ ]; - "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket]; + "plant" = ps: with ps; [ sqlalchemy]; + "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos]; "plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts @@ -619,7 +619,7 @@ "pushbullet" = ps: with ps; [ pushbullet]; "pushover" = ps: with ps; [ pushover-complete]; "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ ]; + "pvoutput" = ps: with ps; [ jsonpath xmltodict]; "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython]; @@ -630,7 +630,7 @@ "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors]; # missing inputs: rachiopy + "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend rachiopy "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird @@ -670,18 +670,18 @@ "rtorrent" = ps: with ps; [ ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "sabnzbd" = ps: with ps; [ ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend + "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: pysabnzbd + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket] "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter - "scrape" = ps: with ps; [ beautifulsoup4]; + "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate - "search" = ps: with ps; [ aiohttp-cors]; + "search" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend "season" = ps: with ps; [ ephem]; "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid "sense" = ps: with ps; [ ]; # missing inputs: sense_energy @@ -716,7 +716,7 @@ "sma" = ps: with ps; [ ]; # missing inputs: pysma "smappee" = ps: with ps; [ ]; # missing inputs: smappy "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab - "smartthings" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmartapp pysmartthings + "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa sqlalchemy]; # missing inputs: home-assistant-frontend pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg "sms" = ps: with ps; [ ]; # missing inputs: python-gammu @@ -737,7 +737,7 @@ "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal "sonos" = ps: with ps; [ pysonos]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp - "soundtouch" = ps: with ps; [ libsoundtouch]; + "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf]; "spaceapi" = ps: with ps; [ aiohttp-cors]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw "speedtestdotnet" = ps: with ps; [ speedtest-cli]; @@ -747,11 +747,11 @@ "spotify" = ps: with ps; [ aiohttp-cors spotipy]; "sql" = ps: with ps; [ sqlalchemy]; "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox - "ssdp" = ps: with ps; [ defusedxml netdisco]; + "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank "startca" = ps: with ps; [ xmltodict]; - "statistics" = ps: with ps; [ ]; + "statistics" = ps: with ps; [ sqlalchemy]; "statsd" = ps: with ps; [ statsd]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd "stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron @@ -911,7 +911,7 @@ "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway "xiaomi" = ps: with ps; [ ha-ffmpeg]; - "xiaomi_aqara" = ps: with ps; [ ]; # missing inputs: PyXiaomiGateway + "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: PyXiaomiGateway "xiaomi_miio" = ps: with ps; [ construct python-miio]; "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv "xmpp" = ps: with ps; [ slixmpp]; @@ -921,7 +921,7 @@ "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast "yandex_transport" = ps: with ps; [ ]; # missing inputs: ya_ma "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ ]; # missing inputs: yeelight + "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: yeelight "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS "yi" = ps: with ps; [ aioftp ha-ffmpeg]; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index f802485d6c62..3c6d0c4bcabc 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -24,7 +24,7 @@ import sys import tarfile import tempfile from io import BytesIO -from typing import Dict, Optional +from typing import Dict, Optional, Set, Any from urllib.request import urlopen COMPONENT_PREFIX = "homeassistant.components" @@ -79,11 +79,14 @@ def parse_components(version: str = "master"): # Recursively get the requirements of a component and its dependencies -def get_reqs(components, component): +def get_reqs(components: Dict[str, Dict[str, Any]], component: str, processed: Set[str]) -> Set[str]: requirements = set(components[component].get("requirements", [])) deps = components[component].get("dependencies", []) + deps.extend(components[component].get("after_dependencies", [])) + processed.add(component) for dependency in deps: - requirements.update(get_reqs(components, dependency)) + if dependency not in processed: + requirements.update(get_reqs(components, dependency, processed)) return requirements @@ -143,7 +146,7 @@ def main() -> None: for component in sorted(components.keys()): attr_paths = [] missing_reqs = [] - reqs = sorted(get_reqs(components, component)) + reqs = sorted(get_reqs(components, component, set())) for req in reqs: # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0 # Therefore, if there's a "#" in the line, only take the part after it From 7daa00707d30cc74d153c6a5134721be1955c1ca Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 21 Jun 2020 16:20:09 +0200 Subject: [PATCH 418/624] dav1d: 0.7.0 -> 0.7.1 --- pkgs/development/libraries/dav1d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 799375ba44d5..0889fdd0d8f4 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -9,14 +9,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0zmn4ald518vgs3cc0ga227aimr38h16mkliq5j8mg6p9dn7nx1w"; + sha256 = "1yawrbaazj6a2rvvb58k6kh492fjxdwlm94bl6ipry0fqmz0rlnl"; }; nativeBuildInputs = [ meson ninja nasm pkgconfig ]; From 87c11dd9531f2d28506f3cec2642cd4b73ecbed7 Mon Sep 17 00:00:00 2001 From: tilpner Date: Sun, 21 Jun 2020 17:39:57 +0200 Subject: [PATCH 419/624] openimagedenoise: 1.1.0 -> 1.2.1 --- .../libraries/openimagedenoise/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 5cecc33564e4..a7098fe93052 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -1,18 +1,16 @@ -{ stdenv, fetchFromGitHub, cmake, tbb, python }: +{ stdenv, fetchzip, cmake, tbb, python, ispc }: stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.1.0"; + version = "1.2.1"; - src = fetchFromGitHub { - owner = "OpenImageDenoise"; - repo = "oidn"; - rev = "v${version}"; - sha256 = "032s7vablqnmrcc4xf2c94kwj0kbcd64bram10g0yc42fg0a3r9m"; - fetchSubmodules = true; + # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs + src = fetchzip { + url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; + sha256 = "1f8s69ixv7nsdap9hc2njli2x75zmlrfq8cy79772gz83kph8s25"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python ispc ]; buildInputs = [ tbb ]; meta = with stdenv.lib; { From b7ca1c7c7ddb85a3366e86e933099c451fd7d0b3 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 21 Jun 2020 13:43:18 +0000 Subject: [PATCH 420/624] vimPlugins.vim-jsx-typescript: init at 2020-04-29 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3b6ca3b0b8b8..fa1576e86cdc 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5114,6 +5114,18 @@ let meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; + vim-jsx-typescript = buildVimPluginFrom2Nix { + pname = "vim-jsx-typescript"; + version = "2020-04-29"; + src = fetchFromGitHub { + owner = "peitalin"; + repo = "vim-jsx-typescript"; + rev = "7b47d06819b5778de78cfbb28c225c3ab276f700"; + sha256 = "0pm40psql6mzrzy750vm6jk71pp467hz9231izicp0554mq6qmsn"; + }; + meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; + }; + vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; version = "2019-11-04"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 15a08782ceba..2a256c547335 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -374,6 +374,7 @@ overcache/NeoSolarized pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim +peitalin/vim-jsx-typescript peterbjorgensen/sved peterhoeg/vim-qml phanviet/vim-monokai-pro From 9cccf17da291492045c2a1e7a61d419f46822dd7 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 21 Jun 2020 14:00:49 +0000 Subject: [PATCH 421/624] vimPlugins.vim-crates: init at 2019-11-11 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fa1576e86cdc..3e42e239541c 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4153,6 +4153,18 @@ let meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/"; }; + vim-crates = buildVimPluginFrom2Nix { + pname = "vim-crates"; + version = "2019-11-11"; + src = fetchFromGitHub { + owner = "mhinz"; + repo = "vim-crates"; + rev = "addbb157d0652ce5288c5b5b6f32f8716eb47898"; + sha256 = "1pczfm9vjjna3xdqym9h69gi47kiwi97lzjf9jjlkmyg1s4pwlsp"; + }; + meta.homepage = "https://github.com/mhinz/vim-crates/"; + }; + vim-csharp = buildVimPluginFrom2Nix { pname = "vim-csharp"; version = "2017-03-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2a256c547335..bd251cfc67c8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -283,6 +283,7 @@ megaannum/self mengelbrecht/lightline-bufferline mfukar/robotframework-vim mg979/vim-visual-multi +mhinz/vim-crates mhinz/vim-grepper mhinz/vim-janah mhinz/vim-sayonara From ed19f15ea4d200c2eda6c8b5dbed7747d0aa7349 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 21 Jun 2020 14:18:11 +0000 Subject: [PATCH 422/624] vimPlugins.semantic-highlight-vim: init at 2019-09-01 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3e42e239541c..beca7097c82b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3023,6 +3023,18 @@ let meta.homepage = "https://github.com/megaannum/self/"; }; + semantic-highlight-vim = buildVimPluginFrom2Nix { + pname = "semantic-highlight-vim"; + version = "2019-09-01"; + src = fetchFromGitHub { + owner = "jaxbot"; + repo = "semantic-highlight.vim"; + rev = "7cf0aabbd0f9cb531b0045ac2148dff1131616de"; + sha256 = "16dnqrdpxf6322az1rn67ay2a4clqz410xn6zqzr1w2y6x4yly1a"; + }; + meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/"; + }; + semshi = buildVimPluginFrom2Nix { pname = "semshi"; version = "2019-12-01"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bd251cfc67c8..ed5984d1b803 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -156,6 +156,7 @@ itchyny/vim-gitbranch ivanov/vim-ipython jacoborus/tender.vim jaredgorski/SpaceCamp +jaxbot/semantic-highlight.vim JazzCore/ctrlp-cmatcher jceb/vim-hier jceb/vim-orgmode From b9931ffe47e5444e379228a0d2708c9e2cd187d4 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 21 Jun 2020 14:54:14 +0000 Subject: [PATCH 423/624] vimPlugins.oceanic-next: init at 2019-04-10 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index beca7097c82b..516ef033a7b1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2639,6 +2639,18 @@ let meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; + oceanic-next = buildVimPluginFrom2Nix { + pname = "oceanic-next"; + version = "2019-04-10"; + src = fetchFromGitHub { + owner = "mhartington"; + repo = "oceanic-next"; + rev = "08158eec24cd154afd1623686aeb336fad580be7"; + sha256 = "1s2h9mnhl54ww7zpdllwlxz93d5i7l7rx3s9mr8w6sv8azcak3v8"; + }; + meta.homepage = "https://github.com/mhartington/oceanic-next/"; + }; + onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; version = "2020-06-11"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ed5984d1b803..887bc4df83df 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -284,6 +284,7 @@ megaannum/self mengelbrecht/lightline-bufferline mfukar/robotframework-vim mg979/vim-visual-multi +mhartington/oceanic-next mhinz/vim-crates mhinz/vim-grepper mhinz/vim-janah From b87ff37047d6b5a3ceaaa3f269daef9e5d0cd9b8 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 21 Jun 2020 15:11:59 +0000 Subject: [PATCH 424/624] vimPlugins.onedark-vim: init at 2020-05-01 --- pkgs/misc/vim-plugins/generated.nix | 18 +++++++++++++++--- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 516ef033a7b1..9e2120d9da36 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2651,6 +2651,18 @@ let meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; + onedark-vim = buildVimPluginFrom2Nix { + pname = "onedark-vim"; + version = "2020-05-01"; + src = fetchFromGitHub { + owner = "joshdick"; + repo = "onedark.vim"; + rev = "4bd965e29811e29e1c1b0819f3a63671d3e6ef28"; + sha256 = "168zim0ifkg441iwwpxdb93fq4ap2ps0rnrad5lqycpgwr0v0bg2"; + }; + meta.homepage = "https://github.com/joshdick/onedark.vim/"; + }; + onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; version = "2020-06-11"; @@ -6904,12 +6916,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-06-19"; + version = "2020-06-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "4465a93001fe2f7800569f63257446114d347a5b"; - sha256 = "1vhi7zqywk15yzigky9nhsgjcjn9qvnpfgdw8173bsxh260bf33k"; + rev = "0b5ece152b56e424b6df6ca9545517007ceb840f"; + sha256 = "1dr98fibcpq6c1adsb4bnbbgg6gpk9brfy3kkrbl49jqf2120zww"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 887bc4df83df..b16785243452 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -177,6 +177,7 @@ jonbri/vim-colorstepper jonsmithers/vim-html-template-literals joonty/vim-xdebug josa42/coc-go +joshdick/onedark.vim jpalardy/vim-slime jparise/vim-graphql jparise/vim-phabricator From b48a4514ca63538dc4192fdbd265992d3b2c7b71 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Thu, 18 Jun 2020 12:37:44 +0000 Subject: [PATCH 425/624] =?UTF-8?q?lepton:=201.2.1=20=E2=86=92=202019-08-2?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/graphics/lepton/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 0088422c6a4a..cbb48fe37280 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, git, glibc }: stdenv.mkDerivation rec { - version = "1.2.1"; - pname = "lepton"; + version = "2019-08-20"; + pname = "lepton-unstable"; src = fetchFromGitHub { repo = "lepton"; owner = "dropbox"; - rev = version; - sha256 = "1f2vyp0crj4yw27bs53vykf2fqk4w57gv3lh9dp89dh3y7wwh1ba"; + rev = "3d1bc19da9f13a6e817938afd0f61a81110be4da"; + sha256 = "0aqs6nvcbq8cbfv8699fa634bsz7csmk0169n069yvv17d1c07fd"; }; nativeBuildInputs = [ cmake git ]; From 735800c7a16ffda2578b4f61b296f0be67920a08 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Jun 2020 19:40:11 +0200 Subject: [PATCH 426/624] esphome: 1.14.3 -> 1.14.4 (#91204) --- .../esphome.nix => tools/misc/esphome/default.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/{servers/home-assistant/esphome.nix => tools/misc/esphome/default.nix} (94%) diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/tools/misc/esphome/default.nix similarity index 94% rename from pkgs/servers/home-assistant/esphome.nix rename to pkgs/tools/misc/esphome/default.nix index 2dc023df5a27..3dd79969554f 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -18,11 +18,11 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.14.3"; + version = "1.14.4"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "0xnsl000c5a2li9qw9anrzzq437qn1n4hcfc24i4rfq37awzmig7"; + sha256 = "10krdmpbafvii0qlg5w94vdv573f3zdqm78ck79d6q0frdd9q9yn"; }; ESPHOME_USE_SUBPROCESS = ""; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe1e861081ee..3f8581687815 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1784,7 +1784,7 @@ in eschalot = callPackage ../tools/security/eschalot { }; - esphome = callPackage ../servers/home-assistant/esphome.nix { }; + esphome = callPackage ../tools/misc/esphome { }; esptool = callPackage ../tools/misc/esptool { }; From f0e598bd849455a4ec3b38cfc5275e0b5c8e91b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Jun 2020 20:10:14 +0200 Subject: [PATCH 427/624] khard: fix tests Sandboxing causes the help to be displayed differently when the COLUMNS variable is not set. See https://github.com/scheibler/khard/issues/263. --- pkgs/applications/misc/khard/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 8646b9864d9e..98cd8a5a4fb0 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -22,6 +22,11 @@ python3.pkgs.buildPythonApplication rec { install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard ''; + preCheck = '' + # see https://github.com/scheibler/khard/issues/263 + export COLUMNS=80 + ''; + meta = { homepage = "https://github.com/scheibler/khard"; description = "Console carddav client"; From dbad5e5f29a642e1c74f7b8e7e0ac718abe54b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sun, 21 Jun 2020 20:10:22 +0200 Subject: [PATCH 428/624] resilio-sync: 2.7.0 -> 2.7.1 Changelog: https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log --- pkgs/applications/networking/resilio-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 9b06676b0179..cdc2f5e14784 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - x86_64-linux = "17vw4kyggmi8phm91jx1skkd7vrdhbahibv6d6zm14q87r01a56f"; - i686-linux = "0yvy3lif2g4jchcp5q1r5b8ndj8009pcq5js7r0kl20bmmcmzklg"; + x86_64-linux = "1gdjpwdg7cpig68wsl3b8w1y12391dh5ipg7g19kr30s6wr3avvm"; + i686-linux = "1b6pzckaixfzhjf38amrkg8pahh2p3jg6cgfacswdx7cjb4a0c4i"; }.${stdenv.hostPlatform.system}; }; From 84871fb982656735337541bbec766b26baa62feb Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Sun, 21 Jun 2020 16:47:54 +0300 Subject: [PATCH 429/624] tracy: add capture and update binaries These are used to capture the trace without using the GUI tool and update the saved trace files from older to newer versions. `update` also allows to re-compress the trace files for whatever reason one might want to do it. --- pkgs/development/tools/tracy/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 93a5554c371d..a5087b3b52c6 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { - name = "tracy-${version}"; + pname = "tracy"; version = "0.7"; src = fetchFromGitHub { @@ -24,11 +24,15 @@ stdenv.mkDerivation rec { buildPhase = '' make -j $NIX_BUILD_CORES -C profiler/build/unix release make -j $NIX_BUILD_CORES -C import-chrome/build/unix/ release + make -j $NIX_BUILD_CORES -C capture/build/unix/ release + make -j $NIX_BUILD_CORES -C update/build/unix/ release ''; installPhase = '' install -D ./profiler/build/unix/Tracy-release $out/bin/Tracy install -D ./import-chrome/build/unix/import-chrome-release $out/bin/import-chrome + install -D ./capture/build/unix/capture-release $out/bin/capture + install -D ./update/build/unix/update-release $out/bin/update ''; meta = with stdenv.lib; { From d9c5a0a13e18ef2fa84339449caf77465b5787af Mon Sep 17 00:00:00 2001 From: Jingjing Duan Date: Sun, 21 Jun 2020 10:56:14 -0700 Subject: [PATCH 430/624] maintainers: add jduan --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4d895d057927..549168cfae08 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3536,6 +3536,12 @@ githubId = 117874; name = "Jeroen de Haas"; }; + jduan = { + name = "Jingjing Duan"; + email = "duanjingjing@gmail.com"; + github = "jduan"; + githubId = 452450; + }; jefdaj = { email = "jefdaj@gmail.com"; github = "jefdaj"; From 59206e50e8ff5748972568dc7143e849bceb2784 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Sun, 21 Jun 2020 18:39:45 +0000 Subject: [PATCH 431/624] vimPlugins.vim-floaterm: init at 2020-06-21 --- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b16785243452..9bd1657e4bd4 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -572,6 +572,7 @@ vimwiki/vimwiki vito-c/jq.vim vmchale/ats-vim vmchale/dhall-vim +voldikss/vim-floaterm VundleVim/Vundle.vim w0ng/vim-hybrid wakatime/vim-wakatime From 8c3ec36de03b674fed3d252a5e9b613038b20994 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sun, 21 Jun 2020 20:45:18 +0200 Subject: [PATCH 432/624] pythonPackages.mautrix: 0.5.4 -> 0.5.7 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 362e34157676..01cabdd9b32d 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.5.4"; + version = "0.5.7"; src = fetchPypi { inherit pname version; - sha256 = "0csvk3y0y2r9gnfqj91fiqprgp8dxiv4n80b6myraab5s7zn1mvv"; + sha256 = "0czymj9k9faky4dyrbxpr8rfrsb28xz9c0p66dcxvchk3m3ac49k"; }; propagatedBuildInputs = [ From db7e2b484b12f8bdb2c049c7a64592c42efd82bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Jun 2020 20:06:39 +0100 Subject: [PATCH 433/624] python3.pkgs.zimports: add missing setuptools (#90026) Co-authored-by: Jon --- pkgs/development/python-modules/zimports/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index 43588361ca78..338dd93150b3 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -5,6 +5,7 @@ , flake8-import-order , pyflakes , mock +, setuptools }: buildPythonPackage rec { @@ -23,12 +24,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyflakes flake8-import-order + setuptools ]; checkInputs = [ mock ]; + checkPhase = '' + runHook preInstallCheck + PYTHONPATH= $out/bin/zimports --help >/dev/null + runHook postInstallCheck + ''; + meta = with lib; { description = "Python import rewriter"; homepage = "https://github.com/sqlalchemyorg/zimports"; From 5f48a53f6912fa27255dc90f1461748ae11b0d72 Mon Sep 17 00:00:00 2001 From: Jingjing Duan Date: Sat, 20 Jun 2020 13:05:11 -0700 Subject: [PATCH 434/624] fastmod: init at 0.4.0 --- pkgs/tools/text/fastmod/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/text/fastmod/default.nix diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix new file mode 100644 index 000000000000..4ea24328b9cf --- /dev/null +++ b/pkgs/tools/text/fastmod/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "fastmod"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "facebookincubator"; + repo = pname; + rev = "v${version}"; + sha256 = "0089a17h0wgan3fs6x1la35lzjs1pib7p81wqkh3zcwvx8ffa8z8"; + }; + + cargoSha256 = "02nkxjwfiljndmi0pv98chfsw9vmjzgmp5r14mchpayp4943qk9m"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A utility that makes sweeping changes to large, shared code bases"; + homepage = "https://github.com/facebookincubator/fastmod"; + license = licenses.asl20; + maintainers = with maintainers; [ jduan ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e31c42261e72..2db73073e62c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -955,6 +955,10 @@ in libfx2 = with python3Packages; toPythonApplication fx2; + fastmod = callPackage ../tools/text/fastmod { + inherit (darwin.apple_sdk.frameworks) Security; + }; + fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; From 0b58e1dcd00489dd954833f3fe94691b01d55a51 Mon Sep 17 00:00:00 2001 From: Thomas Marchand Date: Sun, 21 Jun 2020 23:56:49 +0200 Subject: [PATCH 435/624] wpsoffice: add myself as a maintainer --- pkgs/applications/office/wpsoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 1d32e6ff027b..cc8412e1ac5f 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; hydraPlatforms = []; license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = [ stdenv.lib.maintainers.mlatus ]; + maintainers = with stdenv.lib.maintainers; [ mlatus th0rgal ]; }; buildInputs = with xorg; [ From 06e4bb1a3deb7b458725472926e72be2772815dd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Jun 2020 18:24:49 -0400 Subject: [PATCH 436/624] zziplib: convert back to autotools build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The cmake support in the v0.13.x branch is not very good. It heavily relies on add_custom_command and is fragile. The specific problem we ran into is that the install phase would not create some of the symlinks on darwin. This breaks reverse dependencies (e.g. texlive). Fixes: 4f701dd3 ('zziplib: 0.13.69 → 0.13.71') --- pkgs/development/libraries/zziplib/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 670a911cb6eb..228dfdcf77a4 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -1,7 +1,6 @@ { stdenv -, cmake +, perl , pkg-config -, ninja , fetchFromGitHub , fetchpatch , zip @@ -23,12 +22,6 @@ stdenv.mkDerivation rec { }; patches = [ - # Fix ninja parsing - (fetchpatch { - url = "https://github.com/gdraheim/zziplib/commit/75e22f3c365b62acbad8d8645d5404242800dfba.patch"; - sha256 = "IB0am3K0x4+Ug1CKvowTtkS8JD6zHJJ247A7guJOw80="; - }) - # Install man pages (fetchpatch { url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch"; @@ -44,9 +37,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake + perl pkg-config - ninja # make fails, unable to find test2.zip zip python3 xmlto @@ -60,10 +52,6 @@ stdenv.mkDerivation rec { unzip ]; - cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - ]; - # tests are broken (https://github.com/gdraheim/zziplib/issues/20), # and test/zziptests.py requires network access # (https://github.com/gdraheim/zziplib/issues/24) From 42ab6da6a8ae1318d5e3a5f3a2bc3dcd7196f07c Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Mon, 22 Jun 2020 00:41:47 +0200 Subject: [PATCH 437/624] gitlab-runner: 13.0.1 -> 13.1.0 (#91239) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 9cacf76dbbf9..b788e70a4de2 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.0.1"; + version = "13.1.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1hrdi9fvni21lrc7lx8bjxdiqyf02cihl7pxlvcji0j1lmxyz721"; + sha256 = "1x44vbfcmk95rjkhmfizfdmr1blyj7x1a84hdynrgcyg69m6zikn"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "0k41k6brmdh9rz6k4kis0wabgvrfl1vm63w36h2kk2vnwxg27s91"; + sha256 = "08n3nrpwhb3d3znid2bibg54qxdw5z6r4j5fp8vjh33h45q47q0k"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "155f1lvvx1rq50xjfl4ligxnya9js2rkzp45vwwfdwrvy0qlx8sf"; + sha256 = "0mbcpz1i0jmx5y67cvjwaizbj6jxdqml5m4m42dx96jqk0bv8g55"; }; patches = [ ./fix-shell-path.patch ]; From 06e55617a4ba3e93123130d55ddef87ff2301813 Mon Sep 17 00:00:00 2001 From: Kim Burgess Date: Mon, 22 Jun 2020 11:26:42 +1000 Subject: [PATCH 438/624] ameba: 0.12.1 -> 0.13.0 --- pkgs/development/tools/ameba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index a2d829f85c28..215319e4e65f 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0c2j2qki0czkpsqxv75qg95pk9f0w4rqa5ln07rs4bj9dk2lrr3l"; + sha256 = "0h7s40xk7qmrc560k6vyx67lvimp74giwj21a43np0gcxq4f9icd"; }; meta = with stdenv.lib; { From e00d4d60214e04ba75d19870000e55b8ac4ed4dc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 22 Jun 2020 00:16:32 -0400 Subject: [PATCH 439/624] emscripten: Don't always clain to have a GCC --- .../compilers/emscripten/fastcomp/emscripten-fastcomp.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 520a34afe58d..b74c5c7e9e45 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -2,6 +2,7 @@ let rev = emscriptenVersion; + haveGcc = stdenv.cc.isGNU || stdenv.cc.cc ? gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" "-DLLVM_BUILD_TESTS=ON" "-DCLANG_INCLUDE_TESTS=ON" - ] ++ (stdenv.lib.optional stdenv.isLinux + ] ++ (stdenv.lib.optional (stdenv.isLinux && haveGcc) # necessary for clang to find crtend.o "-DGCC_INSTALL_PREFIX=${gcc}" ); @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { passthru = { isClang = true; + } // stdenv.lib.optionalAttrs haveGcc { inherit gcc; }; From f3f7612a409e4ebbec634ab7f20e094f206d396a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 13 Apr 2020 20:44:43 -0400 Subject: [PATCH 440/624] C++ Compilers: Systematize handling of standard libraries --- .../networking/browsers/firefox/common.nix | 2 +- .../mailreaders/thunderbird/default.nix | 2 +- pkgs/build-support/cc-wrapper/add-flags.sh | 8 +++ pkgs/build-support/cc-wrapper/cc-wrapper.sh | 2 +- pkgs/build-support/cc-wrapper/default.nix | 61 +++++++++++++---- .../compilers/gcc/libstdc++-hook.sh | 4 -- .../development/compilers/llvm/10/default.nix | 17 +---- .../compilers/llvm/10/libc++/default.nix | 9 +-- .../compilers/llvm/10/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/5/default.nix | 14 +--- .../compilers/llvm/5/libc++/default.nix | 9 +-- .../compilers/llvm/5/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/6/default.nix | 14 +--- .../compilers/llvm/6/libc++/default.nix | 9 +-- .../compilers/llvm/6/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/7/default.nix | 68 +++++++++++++------ .../compilers/llvm/7/libc++/default.nix | 9 +-- .../compilers/llvm/7/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/8/default.nix | 19 +----- .../compilers/llvm/8/libc++/default.nix | 9 +-- .../compilers/llvm/8/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/llvm/9/default.nix | 19 +----- .../compilers/llvm/9/libc++/default.nix | 9 +-- .../compilers/llvm/9/libc++/setup-hook.sh | 6 -- pkgs/development/compilers/swift/default.nix | 2 +- pkgs/misc/vim-plugins/overrides.nix | 2 - pkgs/stdenv/darwin/default.nix | 9 +-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 15 ++-- 29 files changed, 150 insertions(+), 199 deletions(-) delete mode 100644 pkgs/development/compilers/gcc/libstdc++-hook.sh delete mode 100644 pkgs/development/compilers/llvm/10/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/5/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/6/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/7/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/8/libc++/setup-hook.sh delete mode 100644 pkgs/development/compilers/llvm/9/libc++/setup-hook.sh diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 8060895a2e0f..a8628306bf19 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -177,7 +177,7 @@ stdenv.mkDerivation ({ BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ - ${stdenv.cc.default_cxx_stdlib_compile} \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ ${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \ $NIX_CFLAGS_COMPILE" diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 73536ae5fc1b..09e72dd8e32b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation rec { BINDGEN_CFLAGS="$(< ${stdenv.cc}/nix-support/libc-cflags) \ $(< ${stdenv.cc}/nix-support/cc-cflags) \ - ${stdenv.cc.default_cxx_stdlib_compile} \ + $(< ${stdenv.cc}/nix-support/libcxx-cxxflags) \ ${ lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${ diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 3398f11e8c21..04be3f408ee1 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -37,6 +37,14 @@ if [ -e @out@/nix-support/libc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi +if [ -e @out@/nix-support/libcxx-cxxflags ]; then + NIX_CXXSTDLIB_COMPILE_@suffixSalt@+=" $(< @out@/nix-support/libcxx-cxxflags)" +fi + +if [ -e @out@/nix-support/libcxx-ldflags ]; then + NIX_CXXSTDLIB_LINK_@suffixSalt@+=" $(< @out@/nix-support/libcxx-ldflags)" +fi + if [ -e @out@/nix-support/cc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index cf00202221e6..3f9f099f3bc1 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -129,7 +129,7 @@ fi if [[ "$isCpp" = 1 ]]; then if [[ "$cppInclude" = 1 ]]; then - NIX_CFLAGS_COMPILE_@suffixSalt@+=" ${NIX_CXXSTDLIB_COMPILE_@suffixSalt@:-@default_cxx_stdlib_compile@}" + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" fi NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index da16a23f9dff..e23d1c6dd4e6 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -48,12 +48,6 @@ let # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile = if (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) && !(targetPlatform.useLLVM or false) then - "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/${targetPlatform.config}" - else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then - "-isystem ${libcxx}/include/c++/v1" - else ""; - # The "suffix salt" is a arbitrary string added in the end of env vars # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used # without interfering. For the moment, it is defined as the target triple, @@ -68,7 +62,7 @@ let # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: - if cc.isGNU or false then + if isGNU then { skylake = versionAtLeast ccVersion "6.0"; skylake-avx512 = versionAtLeast ccVersion "6.0"; cannonlake = versionAtLeast ccVersion "8.0"; @@ -76,7 +70,7 @@ let icelake-server = versionAtLeast ccVersion "8.0"; knm = versionAtLeast ccVersion "8.0"; }.${arch} or true - else if cc.isClang or false then + else if isClang then { cannonlake = versionAtLeast ccVersion "5.0"; icelake-client = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0"; @@ -116,7 +110,7 @@ stdenv.mkDerivation { # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an # unused middle-ground name that evokes both. inherit bintools; - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile; + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; emacsBufferSetup = pkgs: '' ; We should handle propagation here too @@ -173,8 +167,6 @@ stdenv.mkDerivation { export named_cc=${targetPrefix}cc export named_cxx=${targetPrefix}c++ - export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" - if [ -e $ccPath/${targetPrefix}gcc ]; then wrap ${targetPrefix}gcc $wrapper $ccPath/${targetPrefix}gcc ln -s ${targetPrefix}gcc $out/bin/${targetPrefix}cc @@ -226,7 +218,7 @@ stdenv.mkDerivation { strictDeps = true; propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or false [ zlib ]; - depsTargetTargetPropagated = extraPackages; + depsTargetTargetPropagated = optional (libcxx != null) libcxx ++ extraPackages; wrapperName = "CC_WRAPPER"; @@ -250,6 +242,24 @@ stdenv.mkDerivation { fi '' + + optionalString isClang '' + ## + ## General Clang support + ## + + echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags + '' + + + optionalString (isClang && libcxx == null && cc ? gcc) '' + ## + ## GCC libs for non-GCC support + ## + + echo "-B${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-cflags + echo "-L${cc.gcc}/lib/gcc/${targetPlatform.config}/${cc.gcc.version}" >> $out/nix-support/cc-ldflags + echo "-L${cc.gcc.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags + '' + + optionalString (libc != null) ('' ## ## General libc support @@ -279,6 +289,27 @@ stdenv.mkDerivation { echo "${libc_dev}" > $out/nix-support/orig-libc-dev '') + + '' + ## + ## General libc++ support + ## + + '' + + optionalString (libcxx == null && cc ? gcc) '' + for dir in ${cc.gcc}/include/c++/*; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + for dir in ${cc.gcc}/include/c++/*/${targetPlatform.config}; do + echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags + done + '' + + optionalString (libcxx.isLLVM or false) ('' + echo "-isystem ${libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags + echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux '' + echo "-lc++abi" >> $out/nix-support/libcxx-ldflags + '') + + optionalString (!nativeTools) '' ## ## Initial CFLAGS @@ -389,9 +420,9 @@ stdenv.mkDerivation { # There are a few tools (to name one libstdcxx5) which do not work # well with multi line flags, so make the flags single line again + '' - if [ -e "$out/nix-support/libc-cflags" ]; then - substituteInPlace "$out/nix-support/libc-cflags" --replace $'\n' ' ' - fi + for flags in "$out/nix-support"/*flags; do + substituteInPlace "$flags" --replace $'\n' ' ' + done substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh deleted file mode 100644 index f5b4123b64d9..000000000000 --- a/pkgs/development/compilers/gcc/libstdc++-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/@targetConfig@" diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 4181ab29bd7f..870d5110d145 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -57,23 +57,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ - libstdcxxHook targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -100,14 +94,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -127,7 +119,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -145,7 +136,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -161,7 +151,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index ed76ce77a8bb..872865ec474b 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -39,12 +39,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23d..000000000000 --- a/pkgs/development/compilers/llvm/10/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index e7083a6ed13a..5a992f4a3504 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -51,25 +51,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 88ad3c29c3e2..f8185fc3ff4b 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23d..000000000000 --- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index b544a4f6ba69..2316fbfc3fb2 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -51,25 +51,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 57f1431f4711..a922bcfaf0ea 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23d..000000000000 --- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 0b71c3a28d23..b83c0d2ceedd 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -87,48 +79,77 @@ let lldb = callPackage ./lldb.nix {}; + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + bintools = callPackage ./bintools.nix {}; lldClang = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; bintools = wrapBintoolsWith { inherit (tools) bintools; }; extraPackages = [ - # targetLlvmLibraries.libcxx - # targetLlvmLibraries.libcxxabi + targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; lldClangNoLibc = wrapCCWith rec { cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; libc = null; }; extraPackages = [ - # targetLlvmLibraries.libcxx - # targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config} -rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; }; lldClangNoCompilerRt = wrapCCWith { cc = tools.clang-unwrapped; + libcxx = null; bintools = wrapBintoolsWith { inherit (tools) bintools; libc = null; }; extraPackages = [ ]; extraBuildCommands = '' - echo "-nostartfiles -target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-nostartfiles" >> $out/nix-support/cc-cflags ''; }; @@ -148,9 +169,16 @@ let libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - libcxx = callPackage ./libc++ {}; + libcxx = callPackage ./libc++ ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); - libcxxabi = callPackage ./libc++abi.nix {}; + libcxxabi = callPackage ./libc++abi.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + libunwind = libraries.libunwind; + })); openmp = callPackage ./openmp.nix {}; }); diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 96cb671fa431..83c05cf0e634 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -37,12 +37,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23d..000000000000 --- a/pkgs/development/compilers/llvm/7/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index d9383d042bbc..34b1f5e641b8 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -103,14 +95,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -130,7 +120,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -148,7 +137,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -164,7 +152,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 24bca6aafcd1..9c0c7951c794 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -43,12 +43,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23d..000000000000 --- a/pkgs/development/compilers/llvm/8/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 3b6db967b6a2..5d93ca8709fa 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -1,4 +1,4 @@ -{ lowPrio, newScope, pkgs, stdenv, cmake, gcc, libstdcxxHook +{ lowPrio, newScope, pkgs, stdenv, cmake , libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross @@ -58,25 +58,17 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraTools = [ - libstdcxxHook - ]; + libcxx = null; # libstdcxx is smuggled in with clang.gcc extraPackages = [ targetLlvmLibraries.compiler-rt ]; - extraBuildCommands = '' - echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags - echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags - echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags - echo "-L${gcc.cc.lib}/${targetConfig}/lib" >> $out/nix-support/cc-ldflags - '' + mkExtraBuildCommands cc; + extraBuildCommands = mkExtraBuildCommands cc; }; libcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ]; @@ -103,14 +95,12 @@ let inherit (tools) bintools; }; extraPackages = [ - targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi targetLlvmLibraries.compiler-rt ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' @@ -130,7 +120,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags echo "-nostdlib++" >> $out/nix-support/cc-cflags @@ -148,7 +137,6 @@ let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = '' - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + mkExtraBuildCommands cc; @@ -164,7 +152,6 @@ let extraPackages = [ ]; extraBuildCommands = '' echo "-nostartfiles" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags ''; }; diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index f3081d1f2699..cec6de61ca99 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -39,12 +39,9 @@ stdenv.mkDerivation { enableParallelBuilding = true; - linkCxxAbi = stdenv.isLinux; - - setupHooks = [ - ../../../../../build-support/setup-hooks/role.bash - ./setup-hook.sh - ]; + passthru = { + isLLVM = true; + }; meta = { homepage = "https://libcxx.llvm.org/"; diff --git a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh deleted file mode 100644 index 3a274aecc23d..000000000000 --- a/pkgs/development/compilers/llvm/9/libc++/setup-hook.sh +++ /dev/null @@ -1,6 +0,0 @@ -# See pkgs/build-support/setup-hooks/role.bash -getHostRole - -linkCxxAbi="@linkCxxAbi@" -export NIX_CXXSTDLIB_COMPILE${role_post}+=" -isystem @out@/include/c++/v1" -export NIX_CXXSTDLIB_LINK${role_post}=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}" diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 0cd1f704421e..1ebef9a9ba5c 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -258,7 +258,7 @@ stdenv.mkDerivation { buildPhase = '' # gcc-6.4.0/include/c++/6.4.0/cstdlib:75:15: fatal error: 'stdlib.h' file not found - export NIX_CFLAGS_COMPILE="$( echo ${clang.default_cxx_stdlib_compile} ) $NIX_CFLAGS_COMPILE" + export NIX_CFLAGS_COMPILE="$(< $NIX_CC/nix-support/libcxx-cxxflags) $NIX_CFLAGS_COMPILE" # During the Swift build, a full local LLVM build is performed and the resulting clang is invoked. # This compiler is not using the Nix wrappers, so it needs some help to find things. export NIX_LDFLAGS_BEFORE="-rpath ${clang.cc.gcc.lib}/lib -L${clang.cc.gcc.lib}/lib $NIX_LDFLAGS_BEFORE" diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index d9a68b90041e..11ffbfed9ad8 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -98,8 +98,6 @@ self: super: { # These usually implicitly set by cc-wrapper around clang (pkgs/build-support/cc-wrapper). # The linked ruby code shows generates the required '.clang_complete' for cmake based projects # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144 - # as an alternative you can execute the following command: - # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b69de041fd23..9de6ef63bfea 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -90,11 +90,11 @@ in rec { inherit shell; inherit (last) stdenvNoCC; - extraPackages = lib.optional (libcxx != null) libcxx; + extraPackages = []; nativeTools = false; nativeLibc = false; - inherit buildPackages coreutils gnugrep bintools; + inherit buildPackages coreutils gnugrep bintools libcxx; libc = last.pkgs.darwin.Libsystem; isClang = true; cc = { name = "${name}-clang"; outPath = bootstrapTools; }; @@ -168,8 +168,9 @@ in rec { ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; - linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/7/libc++/setup-hook.sh; + passthru = { + isLLVM = true; + }; }; libcxxabi = stdenv.mkDerivation { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 64392f49a52e..e9e835848460 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -264,6 +264,7 @@ mapAliases ({ libudev = udev; # added 2018-04-25 libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 + libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used."; # 2020-06-22 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14a494a164f5..462d67269a64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8188,7 +8188,6 @@ in computecpp = wrapCCWith rec { cc = computecpp-unwrapped; extraPackages = [ - libstdcxxHook llvmPackages.compiler-rt ]; extraBuildCommands = '' @@ -8330,14 +8329,6 @@ in stripped = false; })); - libstdcxxHook = makeSetupHook - { substitutions = { - gcc = gcc-unwrapped; - targetConfig = stdenv.targetPlatform.config; - }; - } - ../development/compilers/gcc/libstdc++-hook.sh; - crossLibcStdenv = overrideCC stdenv (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages_8.lldClangNoLibc @@ -9394,6 +9385,10 @@ in # provide the default choice, avoiding infinite recursion. bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils , libc ? bintools.libc + , # libc++ from the default LLVM version is bound at the top level, but we + # want the C++ library to be explicitly chosen by the caller, and null by + # default. + libcxx ? null , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross , ... } @ extraArgs: @@ -9406,7 +9401,7 @@ in isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit cc bintools libc extraPackages zlib; + inherit cc bintools libc libcxx extraPackages zlib; } // extraArgs; in self); wrapCC = cc: wrapCCWith { From 0458e8862ea4f21e3a8d1ffd313f9513d522ff00 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 09:11:55 -0700 Subject: [PATCH 441/624] python2Packages.flask-caching: disabled python2, abandon --- pkgs/development/python-modules/flask-caching/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 9cb4bad7a71e..57c95cf8800a 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, flask, pytest, pytestcov, pytest-xprocess, pytestcache }: +{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytest, pytestcov, pytest-xprocess, pytestcache }: buildPythonPackage rec { pname = "Flask-Caching"; version = "1.9.0"; + disabled = isPy27; # invalid python2 syntax src = fetchPypi { inherit pname version; From a1af12dcdf114f9aba05193c08b06fa580adaf8e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 09:28:34 -0700 Subject: [PATCH 442/624] python3Packages.structlogs: fix build --- pkgs/development/python-modules/structlog/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 89b37bc8cf3a..8f7e73a454a4 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytest +, pytest-asyncio , python-rapidjson , pretend , freezegun @@ -20,7 +21,7 @@ buildPythonPackage rec { sha256 = "7a48375db6274ed1d0ae6123c486472aa1d0890b08d314d2b016f3aa7f35990b"; }; - checkInputs = [ pytest pretend freezegun simplejson twisted ] + checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] ++ lib.optionals (pythonAtLeast "3.6") [ python-rapidjson ]; propagatedBuildInputs = [ six ]; From aefee8624d29473c68017f15abe9cf693dcdcdb5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 09:42:45 -0700 Subject: [PATCH 443/624] python3Packages.requests-file: fix tests --- pkgs/development/python-modules/requests-file/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index fb375fd501a8..374627a1bb9a 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, requests, six }: +{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, requests, six }: buildPythonPackage rec { pname = "requests-file"; @@ -11,6 +11,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six ]; + checkInputs = [ pytestCheckHook ]; + meta = { homepage = "https://github.com/dashea/requests-file"; description = "Transport adapter for fetching file:// URLs with the requests python library"; From f7c999c912c288e4b67c047c3f36c04126be245e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 09:59:50 -0700 Subject: [PATCH 444/624] python3Package.aioftp: disable tests, missing package --- pkgs/development/python-modules/aioftp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 0ae39db36a52..c8b0e8c11478 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -27,10 +27,13 @@ buildPythonPackage rec { async-timeout ]; + doCheck = false; # requires siosocks, not packaged yet checkPhase = '' pytest ''; + pythonImportsCheck = [ "aioftp" ]; + meta = with lib; { description = "Ftp client/server for asyncio"; homepage = "https://github.com/aio-libs/aioftp"; From 26126db757f1becff7ac1eadff206e3145caa417 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 13:07:28 -0700 Subject: [PATCH 445/624] python3Packages.pytest-astropy-header: init at 0.1.2 --- .../pytest-astropy-header/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-astropy-header/default.nix diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix new file mode 100644 index 000000000000..05c6135a4b9d --- /dev/null +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pytestcov +, pytestCheckHook +, numpy +, astropy +}: + +buildPythonPackage rec { + pname = "pytest-astropy-header"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1y87agr324p6x5gvhziymxjlw54pyn4gqnd49papbl941djpkp5g"; + }; + + propagatedBuildInputs = [ + pytest + ]; + + checkInputs = [ + pytestCheckHook + pytestcov + numpy + astropy + ]; + + meta = with lib; { + description = "Plugin to add diagnostic information to the header of the test output"; + homepage = "https://astropy.org"; + license = licenses.bsd3; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f33a76f4d63..bf689aa4ba57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2496,6 +2496,8 @@ in { pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; + pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; pytestcache = callPackage ../development/python-modules/pytestcache { }; From 19b96a196938b72876b92b7d443713fc7fe3ddb2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 14:29:01 -0700 Subject: [PATCH 446/624] python3Packages.pytest-filter-subpackage: init at 0.1.1 --- .../pytest-filter-subpackage/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-filter-subpackage/default.nix diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix new file mode 100644 index 000000000000..6caf4d9c772e --- /dev/null +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +, pytestcov +, pytest-doctestplus +, pytestCheckHook +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "pytest-filter-subpackage"; + version = "0.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1s4s2kd31yc65rfvl4xhy8xx806xhy59kc7668h6b6wq88xgrn5p"; + }; + + nativeBuildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + pytest + pytest-doctestplus + pytestcov + pytestCheckHook + ]; + + # missing some files + disabledTests = [ "with_rst" ]; + + meta = with lib; { + description = "Meta-package containing dependencies for testing"; + homepage = "https://astropy.org"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf689aa4ba57..f3675f05743a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2498,6 +2498,8 @@ in { pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; + pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; pytestcache = callPackage ../development/python-modules/pytestcache { }; From ba332b6f8f5a5f23d6117204d336ccad1f5e98f9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 14:58:28 -0700 Subject: [PATCH 447/624] python3Packages.pytest-astropy: add missing deps, fix build --- .../python-modules/pytest-astropy/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 3e03460ec2d5..ae3bc04d0b4c 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -1,11 +1,15 @@ { lib , buildPythonPackage , fetchPypi +, hypothesis , pytest +, pytest-astropy-header , pytest-doctestplus +, pytest-filter-subpackage , pytest-remotedata , pytest-openfiles , pytest-arraydiff +, setuptools_scm }: buildPythonPackage rec { @@ -17,16 +21,23 @@ buildPythonPackage rec { sha256 = "619800eb2cbf64548fbea25268efe7c6f6ae206cb4825f34abd36f27bcf946a2"; }; + nativeBuildInputs = [ + setuptools_scm + ]; + propagatedBuildInputs = [ + hypothesis pytest + pytest-astropy-header pytest-doctestplus + pytest-filter-subpackage pytest-remotedata pytest-openfiles pytest-arraydiff ]; # pytest-astropy is a meta package and has no tests - doCheck = false; + checkPhase = ":"; meta = with lib; { description = "Meta-package containing dependencies for testing"; From 3d95ed80b9204234a7548cf2b321ca7ba14e19c9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 15:09:14 -0700 Subject: [PATCH 448/624] python2Packages.pytest-doctestplus: disable python2, abandoned upstream --- pkgs/development/python-modules/pytest-doctestplus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 36e0402dba28..421cca339844 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , six , pytest , numpy @@ -9,6 +10,7 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; version = "0.7.0"; + disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; From b5453127da08dc546baa434e7c61f2cfc9f13b8e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 15:27:34 -0700 Subject: [PATCH 449/624] python3Packages.extension-helpers: init at 0.1 --- .../extension-helpers/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/extension-helpers/default.nix diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix new file mode 100644 index 000000000000..0c23a69a89cd --- /dev/null +++ b/pkgs/development/python-modules/extension-helpers/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, pytestCheckHook +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "extension-helpers"; + version = "0.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc"; + }; + + nativeBuildInputs = [ + setuptools_scm + ]; + + propagatedBuildInputs = [ + pytestCheckHook + ]; + + # avoid importing local module + preCheck = '' + cd extension_helpers + ''; + + # assumes setup.py is in pwd + disabledTests = [ "compiler_module" ]; + + meta = with lib; { + description = "Helpers to assist with building packages with compiled C/Cython extensions"; + homepage = "https://github.com/astropy/extension-helpers"; + license = licenses.bsd3; + maintainers = [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f3675f05743a..24dfbe497144 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6012,6 +6012,8 @@ in { extras = callPackage ../development/python-modules/extras { }; + extension-helpers = callPackage ../development/python-modules/extension-helpers { }; + texttable = callPackage ../development/python-modules/texttable { }; textwrap3 = callPackage ../development/python-modules/textwrap3 { }; From 6647b4c99f87514ea3f187792c7850914bad707e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 15:30:32 -0700 Subject: [PATCH 450/624] python3Packages.reproject: 0.6 -> 0.7.1, fix build --- .../python-modules/reproject/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 43fd7fe67de9..ccc76734461e 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -6,30 +6,26 @@ , astropy , astropy-healpix , astropy-helpers +, extension-helpers , scipy , pytest , pytest-astropy +, setuptools_scm , cython }: buildPythonPackage rec { pname = "reproject"; - version = "0.6"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "484fde86d70d972d703038f138d7c2966ddf51171a6e79bd84e82ea270e27af3"; + sha256 = "1jsc3ad518vyys5987fr1achq8qvnz8rm80zp5an9qxlwr4zmh4m"; }; propagatedBuildInputs = [ numpy astropy astropy-healpix astropy-helpers scipy ]; - nativeBuildInputs = [ astropy-helpers cython ]; - - # Fix tests - patches = [ (fetchpatch { - url = "https://github.com/astropy/reproject/pull/218/commits/4661e075137424813ed77f1ebcbc251fee1b8467.patch"; - sha256 = "13g3h824pqn2lgypzg1b87vkd44y7m302lhw3kh4rfww1dkzhm9v"; - }) ]; + nativeBuildInputs = [ astropy-helpers cython extension-helpers setuptools_scm ]; # Disable automatic update of the astropy-helper module postPatch = '' From b5badcf3d328c0b1fa7da8bd9b8e59ea7018377c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 20 Jun 2020 15:33:37 -0700 Subject: [PATCH 451/624] python3Packages.spectral-cube: fix tests --- pkgs/development/python-modules/spectral-cube/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 3e520919f334..b0b3e4b8f65f 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , buildPythonPackage +, aplpy , astropy , radio_beam , pytest @@ -24,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-helpers ]; - checkInputs = [ pytest pytest-astropy ]; + checkInputs = [ aplpy pytest pytest-astropy ]; # Disable automatic update of the astropy-helper module postPatch = '' From b8d1c67679d033d3586090fef2d449fb9195be8c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Jun 2020 13:27:09 +0200 Subject: [PATCH 452/624] pythonPackages.crashtest: init at 0.3.0 --- .../python-modules/crashtest/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/crashtest/default.nix diff --git a/pkgs/development/python-modules/crashtest/default.nix b/pkgs/development/python-modules/crashtest/default.nix new file mode 100644 index 000000000000..e4c7fb839f91 --- /dev/null +++ b/pkgs/development/python-modules/crashtest/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, isPy27, pytest }: + +buildPythonPackage rec { + pname = "crashtest"; + version = "0.3.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "056zzbznl3xfnbblfci8lvcam3h7k7va68vi6asrm4q0ck4nrh79"; + }; + + # has tests, but only on GitHub, however the pyproject build fails for me + pythonImportsCheck = [ + "crashtest.frame" + "crashtest.inspector" + ]; + + meta = with lib; { + homepage = "https://github.com/sdispater/crashtest"; + description = "Manage Python errors with ease"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24dfbe497144..4d4a3ad052bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2030,6 +2030,8 @@ in { cornice = callPackage ../development/python-modules/cornice { }; + crashtest = callPackage ../development/python-modules/crashtest { }; + cram = callPackage ../development/python-modules/cram { }; crc16 = callPackage ../development/python-modules/crc16 { }; From 3bfcfa9a76bfd141d2ea9bb9f04d176126ad79c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Jun 2020 13:28:05 +0200 Subject: [PATCH 453/624] pythonPackages.clikit: 0.6.1 -> 0.6.2 Also fix the build by adding the crashtest dependency. --- pkgs/development/python-modules/clikit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 7bab3a93e551..da2958067238 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,18 +1,18 @@ { lib, buildPythonPackage, fetchPypi , isPy27 -, pylev, pastel, typing, enum34 }: +, pylev, pastel, typing, enum34, crashtest }: buildPythonPackage rec { pname = "clikit"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "0603e3c19fa106f5df5f224826c92e57221f48ec969e42744173e0458d359354"; + sha256 = "0ngdkmb73gkp5y00q7r9k1cdlfn0wyzws2wrqlshc4hlkbdyabj4"; }; propagatedBuildInputs = [ - pylev pastel + crashtest pylev pastel ] ++ lib.optionals isPy27 [ typing enum34 ]; # The Pypi tarball doesn't include tests, and the GitHub source isn't From 7fae3f853449eb92a7e00053955ef048d920124d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 21 Jun 2020 13:31:52 +0200 Subject: [PATCH 454/624] pythonPackages.poetry: 1.0.5 -> 1.0.9 Disables Python2 support and enables tests. Co-Authored-By: Jonathan Ringer --- .../python-modules/poetry/default.nix | 110 +++++++++--------- .../python-modules/poetry/glob2.nix | 11 -- 2 files changed, 58 insertions(+), 63 deletions(-) delete mode 100644 pkgs/development/python-modules/poetry/glob2.nix diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 46be9bc92a28..e0be5f5ed0aa 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,74 +1,74 @@ -{ lib, buildPythonPackage, fetchPypi, callPackage -, isPy27 -, pythonOlder -, cleo -, requests -, cachy -, requests-toolbelt -, pyrsistent -, pyparsing +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pythonOlder , cachecontrol -, pkginfo -, html5lib -, shellingham -, subprocess32 -, tomlkit -, typing -, pathlib2 -, virtualenv -, functools32 +, cachy +, cleo , clikit -, keyring -, pexpect +, html5lib +, httpretty , importlib-metadata -, pytest -, jsonschema , intreehooks +, jsonschema +, keyring , lockfile +, pexpect +, pkginfo +, pygments +, pyparsing +, pyrsistent +, pytestCheckHook +, pytestcov +, pytest-mock +, requests +, requests-toolbelt +, shellingham +, tomlkit }: -let - glob2 = callPackage ./glob2.nix { }; - -in buildPythonPackage rec { +buildPythonPackage rec { pname = "poetry"; - version = "1.0.5"; + version = "1.0.9"; format = "pyproject"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"; + src = fetchFromGitHub { + owner = "python-poetry"; + repo = pname; + rev = version; + sha256 = "0gi1li55rim60hf1gdpgpx84zlkaj0wv12wbv7dib9malhfj3pnz"; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.15.0\"" \ - --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.0\"" \ + --replace "pyrsistent = \"^0.14.2\"" "pyrsistent = \"^0.16.0\"" \ + --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.1\"" \ --replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \ - 'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}' + 'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}' \ + --replace "tomlkit = \"^0.5.11\"" "tomlkit = \"^0.6.0\"" \ + --replace "cleo = \"^0.7.6\"" "cleo = \"^0.8.0\"" \ + --replace "version = \"^20.0.1\", python = \"^3.5\"" "version = \"^21.0.0\", python = \"^3.5\"" \ + --replace "clikit = \"^0.4.2\"" "clikit = \"^0.6.2\"" ''; nativeBuildInputs = [ intreehooks ]; propagatedBuildInputs = [ + cachecontrol + cachy cleo clikit - requests - cachy - requests-toolbelt - jsonschema - pyrsistent - pyparsing - cachecontrol - pkginfo html5lib - shellingham - tomlkit - pexpect + jsonschema keyring lockfile - ] ++ lib.optionals isPy27 [ typing pathlib2 glob2 virtualenv functools32 subprocess32 ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + pexpect + pkginfo + pyparsing + pyrsistent + requests + requests-toolbelt + shellingham + tomlkit + ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; postInstall = '' mkdir -p "$out/share/bash-completion/completions" @@ -79,12 +79,18 @@ in buildPythonPackage rec { "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" ''; - # No tests in Pypi tarball - doCheck = false; - checkInputs = [ pytest ]; - checkPhase = '' - pytest tests - ''; + checkInputs = [ pytestCheckHook httpretty pytest-mock pygments pytestcov ]; + preCheck = "export HOME=$TMPDIR"; + disabledTests = [ + # touches network + "git" + "solver" + "load" + "vcs" + "prereleases_if_they_are_compatible" + # requires git history to work correctly + "default_with_excluded_data" + ]; meta = with lib; { homepage = "https://python-poetry.org/"; diff --git a/pkgs/development/python-modules/poetry/glob2.nix b/pkgs/development/python-modules/poetry/glob2.nix deleted file mode 100644 index ca7d203492dd..000000000000 --- a/pkgs/development/python-modules/poetry/glob2.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "glob2"; - version = "0.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "1miyz0pjyji4gqrzl04xsxcylk3h2v9fvi7hsg221y11zy3adc7m"; - }; -} From 8852a81022755a3e1e05fda8a545a2aef01e043b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Jun 2020 22:28:32 -0400 Subject: [PATCH 455/624] texlive: fix build for scheme-infraonly --- pkgs/tools/typesetting/tex/texlive/combine.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index ee4d0dfe588a..fb3e6668a47c 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -49,6 +49,10 @@ in buildEnv { ignoreCollisions = false; paths = pkgList.nonbin; + pathsToLink = [ + "/" + "/tex/generic/config" # make it a real directory for scheme-infraonly + ]; buildInputs = [ makeWrapper ] ++ pkgList.extraInputs; From 7b9448665e4be84c3f97becded3676e150f94694 Mon Sep 17 00:00:00 2001 From: Phil Wetzel Date: Sat, 30 May 2020 22:42:49 -0400 Subject: [PATCH 456/624] mwprocapture: 1.2.4054 -> 1.2.4177 --- pkgs/os-specific/linux/mwprocapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index acb4676a3f51..c5f293011db3 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { name = "mwprocapture-1.2.${version}-${kernel.version}"; - version = "4054"; + version = "4177"; src = fetchurl { url = "http://www.magewell.com/files/drivers/ProCaptureForLinux_${version}.tar.gz"; - sha256 = "0ylx75jcwlqds8w6lm11nxdlzxvy7xlz4rka2k5d6gmqa5fv19c2"; + sha256 = "1nf51w9yixpvr767k49sfdb9n9rv5qc72f5yki1mkghbmabw7vys"; }; nativeBuildInputs = [ kernel.moduleBuildDependencies ]; From 7bf20d7c17fe08f5c8ceb914b27b9be08da4454e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 22 Jun 2020 09:29:55 +0200 Subject: [PATCH 457/624] ruby: use buildPackages.bison_3_5, fixes cross compilation Ruby is not compatible with the latest bison version we have so in 458b2cb7d67561c796c6f0660a97eea9b685fc65 I made it use the older 3.5. This broke cross-compilation. bison is a native build input, so we need to take it from the `buildPackages` set. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d293d0000b21..2b7cdf6acda3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9808,7 +9808,7 @@ in inherit (callPackage ../development/interpreters/ruby { inherit (darwin) libiconv libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; - bison = bison_3_5; + bison = buildPackages.bison_3_5; }) ruby_2_5 ruby_2_6 From 9e3dd2279529128f5aec584874185b86eaff08aa Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 8 May 2020 18:33:07 +0700 Subject: [PATCH 458/624] code-server: init at 3.4.1 --- pkgs/servers/code-server/default.nix | 187 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 189 insertions(+) create mode 100644 pkgs/servers/code-server/default.nix diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix new file mode 100644 index 000000000000..91da7e179b4a --- /dev/null +++ b/pkgs/servers/code-server/default.nix @@ -0,0 +1,187 @@ +{ stdenv, fetchFromGitHub, makeWrapper, runCommand +, moreutils, jq, git, zip, rsync, pkgconfig, yarn, python2 +, nodejs-12_x, libsecret, xorg, ripgrep, nettools }: + +let + system = stdenv.hostPlatform.system; + + nodejs = nodejs-12_x; + python = python2; + yarn' = yarn.override { inherit nodejs; }; + defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; + +in stdenv.mkDerivation rec { + pname = "code-server"; + version = "3.4.1"; + commit = "d3773c11f147bdd7a4f5acfefdee23c26f069e76"; + + src = fetchFromGitHub { + owner = "cdr"; + repo = "code-server"; + rev = version; + sha256 = "PfDD0waloppGZ09zCQ9ggBeVL/Dhfv6QmEs/fs7QLtA="; + fetchSubmodules = true; + }; + + yarnCache = stdenv.mkDerivation { + name = "${pname}-${version}-${system}-yarn-cache"; + inherit src; + phases = ["unpackPhase" "buildPhase"]; + nativeBuildInputs = [ yarn' git ]; + buildPhase = '' + export HOME=$PWD + + patchShebangs ./ci + + # apply code-server patches as code-server has patched vscode yarn.lock + yarn vscode:patch + + yarn config set yarn-offline-mirror $out + find "$PWD" -name "yarn.lock" -printf "%h\n" | \ + xargs -I {} yarn --cwd {} \ + --frozen-lockfile --ignore-scripts --ignore-platform \ + --ignore-engines --no-progress --non-interactive + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + + # to get hash values use nix-build -A code-server.yarnPrefetchCache + outputHash = { + x86_64-linux = "Zze2hEm2Np+SyQ0KXy5CZr5wilZbHBYXNYcRJBUUkQo="; + aarch64-linux = "LiIvGuBismWSL2yV2DuKUWDjIzuIQU/VVxtiD4xJ+6Q="; + }.${system} or (throw "Unsupported system ${system}"); + }; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + nativeBuildInputs = [ + nodejs yarn' python pkgconfig zip makeWrapper git rsync jq moreutils + ]; + buildInputs = [ libsecret xorg.libX11 xorg.libxkbfile ]; + + patchPhase = '' + export HOME=$PWD + + patchShebangs ./ci + + # apply code-server vscode patches + yarn vscode:patch + + # allow offline install for vscode + substituteInPlace lib/vscode/build/npm/postinstall.js \ + --replace '--ignore-optional' '--offline' + + # fix path to ifconfig, so vscode can get mac address + substituteInPlace lib/vscode/src/vs/base/node/macAddress.ts \ + --replace '/sbin/ifconfig' '${nettools}/bin/ifconfig' + + # disable automatic updates + sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \ + lib/vscode/src/vs/platform/update/common/update.config.contribution.ts + + # inject git commit + substituteInPlace ci/build/build-release.sh \ + --replace '$(git rev-parse HEAD)' "$commit" + + # remove all built-in extensions, as these are 3rd party extensions that + # gets downloaded from vscode marketplace + jq --slurp '.[0] * .[1]' "lib/vscode/product.json" <( + cat << EOF + { + "builtInExtensions": [] + } + EOF + ) | sponge lib/vscode/product.json + ''; + + configurePhase = '' + # set default yarn opts + ${stdenv.lib.concatMapStrings (option: '' + yarn --offline config set ${option} + '') defaultYarnOpts} + + # set offline mirror to yarn cache we created in previous steps + yarn --offline config set yarn-offline-mirror "${yarnCache}" + + # set nodedir, so we can build binaries later + npm config set nodedir "${nodeSources}" + + # skip browser downloads for playwright + export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD="true" + ''; + + buildPhase = '' + # install code-server dependencies + yarn --offline + + # install vscode dependencies without running script for all vscode packages + # that require patching for postinstall scripts to succeed + for d in lib/vscode lib/vscode/build; do + yarn --offline --cwd $d --offline --ignore-scripts + done + + # put ripgrep binary into bin, so postinstall does not try to download it + find -name vscode-ripgrep -type d \ + -execdir mkdir -p {}/bin \; \ + -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \; + + # patch shebangs of everything, also cached files, as otherwise postinstall + # will not be able to find /usr/bin/env, as it does not exists in sandbox + patchShebangs . + + # rebuild binaries, we use npm here, as yarn does not provider alternative + # that would not atempt to try to reinstall everything and break out + # patching attempts + npm rebuild --prefix lib/vscode --update-binary + + # run postinstall scripts, which eventually do yarn install on all + # additional requirements + yarn --cwd lib/vscode postinstall --frozen-lockfile --offline + + # build code-server + yarn build + + # build vscode + yarn build:vscode + + # create release + yarn release + ''; + + installPhase = '' + mkdir -p $out/libexec/code-server $out/bin + + # copy release to libexec path + cp -R -T release "$out/libexec/code-server" + + # install only production dependencies + yarn --offline --cwd "$out/libexec/code-server" --production + + # create wrapper + makeWrapper "${nodejs-12_x}/bin/node" "$out/bin/code-server" \ + --add-flags "$out/libexec/code-server/out/node/entry.js" + ''; + + passthru = { + prefetchYarnCache = stdenv.lib.overrideDerivation yarnCache (d: { + outputHash = stdenv.lib.fakeSha256; + }); + }; + + meta = with stdenv.lib; { + description = "Run VS Code on a remote server."; + longDescription = '' + code-server is VS Code running on a remote server, accessible through the + browser. + ''; + homepage = "https://github.com/cdr/code-server"; + license = licenses.mit; + maintainers = with maintainers; [ offline ]; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b7cdf6acda3..5bd8569c3ae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22816,6 +22816,8 @@ in vscodium = callPackage ../applications/editors/vscode/vscodium.nix { }; + code-server = callPackage ../servers/code-server { }; + vue = callPackage ../applications/misc/vue { }; vuze = callPackage ../applications/networking/p2p/vuze { }; From c8c09b7dda6061bb11c6f893c0be04db83461765 Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 20 May 2020 02:33:41 +0000 Subject: [PATCH 459/624] add autoPatchelfIgnoreMissingDeps to auto-patchelf.sh --- doc/stdenv/stdenv.xml | 3 +++ pkgs/build-support/setup-hooks/auto-patchelf.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index ee93f39318b8..818e6c5da00c 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -2018,6 +2018,9 @@ addEnvHooks "$hostOffset" myBashFunction In certain situations you may want to run the main command (autoPatchelf) of the setup hook on a file or a set of directories instead of unconditionally patching all outputs. This can be done by setting the dontAutoPatchelf environment variable to a non-empty value. + + By default autoPatchelf will fail as soon as any ELF file requires a dependency which cannot be resolved via the given build inputs. In some situations you might prefer to just leave missing dependencies unpatched and continue to patch the rest. This can be achieved by setting the autoPatchelfIgnoreMissingDeps environment variable to a non-empty value. + The autoPatchelf command also recognizes a --no-recurse command line flag, which prevents it from recursing into subdirectories. diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 72970623ed79..4f7c0c14304c 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -141,7 +141,7 @@ autoPatchelfFile() { # This makes sure the builder fails if we didn't find a dependency, because # the stdenv setup script is run with set -e. The actual error is emitted # earlier in the previous loop. - [ $depNotFound -eq 0 ] + [ $depNotFound -eq 0 -o -n "$autoPatchelfIgnoreMissingDeps" ] if [ -n "$rpath" ]; then echo "setting RPATH to: $rpath" >&2 From 4c0a6e855c674183b59e1725698c97961e4c792e Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 22 Jun 2020 11:53:50 +0300 Subject: [PATCH 460/624] topgrade: 4.7.0 -> 4.8.0 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 21e464c6d29e..ca146bcf0fcf 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1hg03mj3rd778hq1856139nwz7y5gykwvg7xhxlsiabv7gr06m2m"; + sha256 = "1rskk3cb253xbdn42ccm5ks39xac4q1hgz67nfi1hpwnavpx5g6p"; }; - cargoSha256 = "14qv2157jhj7hilvqi3c00p11rzv0vvimr4d34nyspgzxz2si6sm"; + cargoSha256 = "0d00r52qhahdx1yylpri7cm85csvy0bwzspwgwqwgilxcfnf5a16"; buildInputs = lib.optional stdenv.isDarwin Foundation; From 554e90cae7e9103a66c6b16e3a5888f292731f72 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 22 Jun 2020 11:05:41 +0200 Subject: [PATCH 461/624] vimPlugins.vim-bsv: init at 2019-07-11 (#91253) This provides syntax highlighting, autoindent, completions and more for Bluespec (.bsv) files. --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9e2120d9da36..5cd7df4597f2 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4021,6 +4021,18 @@ let meta.homepage = "https://github.com/bling/vim-bufferline/"; }; + vim-bsv = buildVimPluginFrom2Nix { + pname = "vim-bsv"; + version = "2019-07-11"; + src = fetchFromGitHub { + owner = "mtikekar"; + repo = "vim-bsv"; + rev = "dc775cb06891dd0923b5e2a882f5dcee6451540a"; + sha256 = "18wsbvypi62nwgcazw2m47d6k8ymlv1zwabs2gwl931n710ldkfc"; + }; + meta.homepage = "https://github.com/mtikekar/vim-bsv/"; + }; + vim-bufkill = buildVimPluginFrom2Nix { pname = "vim-bufkill"; version = "2020-04-29"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9bd1657e4bd4..7b34ff4bd8b1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -302,6 +302,7 @@ mopp/sky-color-clock.vim morhetz/gruvbox motus/pig.vim mpickering/hlint-refactor-vim +mtikekar/vim-bsv nanotech/jellybeans.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides From aac8f4550095214dc36dfe9e9e19190a5d454734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 22 Jun 2020 09:53:27 +0100 Subject: [PATCH 462/624] home-assistant: add override for pyowm 3.0 is not compatible with home-assistant --- pkgs/servers/home-assistant/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 366415dd9e2a..111c09d80290 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -27,6 +27,11 @@ let (mkOverride "astral" "1.10.1" "d2a67243c4503131c856cafb1b1276de52a86e5b8a1d507b7e08bee51cb67bf1") + # We have 3.x in nixpkgs which is incompatible with home-assistant atm: + # https://github.com/home-assistant/core/blob/dev/requirements_all.txt + (mkOverride "pyowm" "2.10.0" + "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g") + # required by aioesphomeapi (self: super: { protobuf = super.protobuf.override { From fea4603212a1ddcdffe4cb49c44e7e4fa60824b1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 22 Jun 2020 17:19:35 +0800 Subject: [PATCH 463/624] sqlitebrowser: 3.11.2 -> 3.12.0 (#91271) --- .../tools/database/sqlitebrowser/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index f8a8ee70e9d6..7fcdbd1a6ad8 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,30 +1,30 @@ { mkDerivation, lib, fetchFromGitHub, cmake, antlr -, qtbase, qttools, qscintilla, sqlite }: +, qtbase, qttools, sqlite }: mkDerivation rec { pname = "sqlitebrowser"; - version = "3.11.2"; + version = "3.12.0"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx"; + owner = pname; + repo = pname; + rev = version; + sha256 = "1arv4rzl8s1vjjqzz35l2b1rfzr2b8b23v97fdw1kdxpwvs63l99"; }; - buildInputs = [ antlr qtbase qscintilla sqlite ]; + # We should be using qscintilla from nixpkgs instead of the vendored version, + # but qscintilla is currently in a bit of a mess as some consumers expect a + # -qt4 or -qt5 prefix while others do not. + # We *really* should get that cleaned up. + buildInputs = [ antlr qtbase sqlite ]; nativeBuildInputs = [ cmake qttools ]; - NIX_LDFLAGS = "-lQt5PrintSupport"; - - enableParallelBuilding = true; - meta = with lib; { description = "DB Browser for SQLite"; homepage = "https://sqlitebrowser.org/"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; } From 14bc25038b1f2656bf30239ee7a04b0f863a7f3c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 22 Jun 2020 11:01:40 +0200 Subject: [PATCH 464/624] gitea: 1.12.0 -> 1.12.1 https://github.com/go-gitea/gitea/releases/tag/v1.12.1 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 9ca29096882e..aaae2a4a257b 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "1nsi7d2jackkjvinp5wglrzb61f2hihrn6qgwlp1zb185k2qpd23"; + sha256 = "0n92msf5pbgb5q6pa2p0nj9lnzs4y0qis62c5mp4hp8rc1j22wlb"; }; unpackPhase = '' From b505bf202b0c23e3bd22d2555d79d6fbb2fa498c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 22 Jun 2020 11:54:54 +0200 Subject: [PATCH 465/624] Update nixUnstable and nixFlakes --- pkgs/tools/package-management/nix/default.nix | 33 +++++-------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 363a7cb04988..a7eca679780d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -13,7 +13,7 @@ common = , bash, coreutils, gzip, gnutar , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns - , jq, libarchive, rustc, cargo + , jq, libarchive # Used by tests , gmock , busybox-sandbox-shell @@ -23,7 +23,7 @@ common = , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? false - , name, suffix ? "", src, crates ? null + , name, suffix ? "", src }: let @@ -49,7 +49,7 @@ common = brotli boost editline ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive rustc cargo ] + ++ lib.optionals is24 [ libarchive ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { @@ -88,11 +88,6 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + - # Unpack the Rust crates. - lib.optionalString is24 '' - tar xvf ${crates} -C nix-rust/ - mv nix-rust/nix-vendored-crates* nix-rust/vendor - '' + # For Nix-2.3, patch around an issue where the Nix configure step pulls in the # build system's bash and other utilities when cross-compiling lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) '' @@ -200,18 +195,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre7534_b92f58f6"; + suffix = "pre7805_984e5213"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "b92f58f6d9e44f97002d1722bd77bad939824c1c"; - sha256 = "1p791961y5v04kpz37g6hm98f1ig7i34inxl9dcj3pbqhf5kicxg"; - }; - - crates = fetchurl { - url = "https://hydra.nixos.org/build/118797694/download/1/nix-vendored-crates-2.4pre7534_b92f58f6.tar.xz"; - sha256 = "a4c2612bbd81732bbb899bc0c230e07b16f6b6150ffbb19c4907dedbbc2bf9fc"; + rev = "984e521392b3f41f7cdab203e5c00f3e00e27a28"; + sha256 = "1dch48018dwzx9cysnfxrdpszav87s0d635zqw810mgmqpm25fw8"; }; inherit storeDir stateDir confDir boehmgc; @@ -219,18 +209,13 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200521_00b562c"; + suffix = "pre20200622_334e26b"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "00b562c87ec4c3bbe514f5dc1f4d1c41f66f66bf"; - sha256 = "0s8is2czpkcj1x1kcjqgbnsbbl03w3fwjjiclsd44zh1ij3wb90s"; - }; - - crates = fetchurl { - url = "https://hydra.nixos.org/build/118093786/download/1/nix-vendored-crates-2.4pre20200501_941f952.tar.xz"; - sha256 = "060f4n5srdbb8vsj0m14aqch7im79a4h5g3nrs41p1xc602vhcdl"; + rev = "334e26bfc2ce82912602e8a0f9f9c7e0fb5c3221"; + sha256 = "14a2yyn1ygymlci6hl5d308fs3p3m0mgcfs5dc8dn0s3lg5qvbmp"; }; inherit storeDir stateDir confDir boehmgc; From dbda6555c1ec1fe32adb3fe6d925d57103170acb Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 5 Jun 2020 14:18:40 +0200 Subject: [PATCH 466/624] perlPackages.Mojolicious: 8.32 -> 8.55 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3e44398f6a6..a54aa6397610 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12285,10 +12285,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.32"; + version = "8.55"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.32.tar.gz"; - sha256 = "11fyz534syihisl8498655bqq4y8c73a6xhvl1wlq4axdgkm0d2h"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.55.tar.gz"; + sha256 = "116f79a8jvdk0zfj34gp3idhxgk4l8qq4ka6pwhdp8pmks969w0x"; }; meta = { homepage = "https://mojolicious.org"; From 1fecbbcf8efd04af38138d9efd5140870b9ede9a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 22 Jun 2020 13:58:09 +0200 Subject: [PATCH 467/624] perlPackages.Mojolicious: add sgo to maintainers --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a54aa6397610..1b762a6d4294 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12294,7 +12294,7 @@ let homepage = "https://mojolicious.org"; description = "Real-time web framework"; license = stdenv.lib.licenses.artistic2; - maintainers = [ maintainers.thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice sgo ]; }; }; From 15f889d30ec4e51bdb58cf25ccc6477be1d5781a Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 5 Jun 2020 14:42:54 +0200 Subject: [PATCH 468/624] perlPackages.JSONValidator: 3.23 -> 4.00 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1b762a6d4294..99a1bf608315 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9931,10 +9931,10 @@ let JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "3.23"; + version = "4.00"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.23.tar.gz"; - sha256 = "1fzy2z7mkg5vgcjvykh5ay8yg6q496wi14x9wp5hc9agplsq7f0s"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.00.tar.gz"; + sha256 = "09p6n5ahsa13fmxb01siz9hcmyswgb05ac2njbhzim6cnx9d6cwj"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; From e755287ecdbed6f5302e30c146a694dbba4ea514 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 5 Jun 2020 14:19:29 +0200 Subject: [PATCH 469/624] perlPackages.MojoliciousPluginOpenAPI: 2.21 -> 3.33 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 99a1bf608315..230e7ae0ff42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12316,10 +12316,10 @@ let MojoliciousPluginOpenAPI = buildPerlPackage { pname = "Mojolicious-Plugin-OpenAPI"; - version = "2.21"; + version = "3.33"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.21.tar.gz"; - sha256 = "34b1f42d846c26d8be3a3556dc5a02dd7ab47c5612b41d3caf1ce6bc16101dc2"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.33.tar.gz"; + sha256 = "0lccvanc3cici83j6fx7gg3wdcsvgv8d7hzd06r0q1mp8329sbv4"; }; propagatedBuildInputs = [ JSONValidator ]; meta = { From 497ac5b423d0adbe5bf9d9466623ebeef40eae82 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 5 Jun 2020 14:49:44 +0200 Subject: [PATCH 470/624] convos: init at 4.22 dependencies: perlPackages.IRCUtils: init at 0.12 perlPackages.LinkEmbedder: init at 1.12 perlPackages.MojoliciousPluginWebpack: init at 0.12 perlPackages.ParseIRC: init at 1.22 perlPackages.TimePiece: init at 1.3401 perlPackages.UnicodeUTF8: init at 0.62 --- .../networking/irc/convos/default.nix | 71 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/perl-packages.nix | 94 +++++++++++++++++++ 3 files changed, 167 insertions(+) create mode 100644 pkgs/applications/networking/irc/convos/default.nix diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix new file mode 100644 index 000000000000..a4eae497bc9d --- /dev/null +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang }: + +with stdenv.lib; + +perlPackages.buildPerlPackage rec { + pname = "convos"; + version = "4.22"; + + src = fetchFromGitHub rec { + owner = "Nordaaker"; + repo = pname; + rev = version; + sha256 = "0a5wq88ncbn7kwcw3z4wdl1wxmx5vq5a7crb1bvbvskgwwy8zfx8"; + }; + + nativeBuildInputs = [ makeWrapper ] + ++ optional stdenv.isDarwin [ shortenPerlShebang ]; + + buildInputs = with perlPackages; [ + CryptEksblowfish FileHomeDir FileReadBackwards + IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall + Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginWebpack + ParseIRC TextMarkdown TimePiece UnicodeUTF8 + CpanelJSONXS EV + ]; + + checkInputs = with perlPackages; [ TestDeep TestMore ]; + + postPatch = '' + patchShebangs script/convos + ''; + + # A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in + # the sandbox, we replace the this out from a substitution expression + # + # Module::Install is a runtime dependency not covered by the tests, so we add + # a test for it. + # + preCheck = '' + substituteInPlace t/web-register-open-to-public.t \ + --replace '!127.0.0.1!' '!localhost!' + + echo "use Test::More tests => 1;require_ok('Module::Install')" \ + > t/00_nixpkgs_module_install.t + ''; + + # Convos expects to find assets in both auto/share/dist/Convos, and $MOJO_HOME + # which is set to $out + # + postInstall = '' + AUTO_SHARE_PATH=$out/${perl.libPrefix}/auto/share/dist/Convos + mkdir -p $AUTO_SHARE_PATH + cp -vR public assets $AUTO_SHARE_PATH/ + ln -s $AUTO_SHARE_PATH/public/asset $out/asset + cp -vR templates $out/templates + cp cpanfile $out/cpanfile + '' + optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/convos + '' + '' + wrapProgram $out/bin/convos --set MOJO_HOME $out + ''; + + passthru.tests = nixosTests.convos; + + meta = { + homepage = "https://convos.chat"; + description = "Convos is the simplest way to use IRC in your browser"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f8581687815..d894d8ac305b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19156,6 +19156,8 @@ in codeblocks = callPackage ../applications/editors/codeblocks { }; codeblocksFull = codeblocks.override { contribPlugins = true; }; + convos = callPackage ../applications/networking/irc/convos { }; + comical = callPackage ../applications/graphics/comical { }; containerd = callPackage ../applications/virtualization/containerd { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 230e7ae0ff42..102db43bc327 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9698,6 +9698,21 @@ let }; }; + IRCUtils = buildPerlPackage { + pname = "IRC-Utils"; + version = "0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HI/HINRIK/IRC-Utils-0.12.tar.gz"; + sha256 = "c7d6311eb6c79e983833c9e6b4e8d426d07a9874d20f4bc641b313b99c9bc8a0"; + }; + meta = { + homepage = "http://metacpan.org/release/IRC-Utils"; + description = "Common utilities for IRC-related tasks"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + # TODO: use CPAN version ImageExifTool = buildPerlPackage { pname = "Image-ExifTool"; @@ -10302,6 +10317,23 @@ let doCheck = false; }; + LinkEmbedder = buildPerlPackage { + pname = "LinkEmbedder"; + version = "1.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.12.tar.gz"; + sha256 = "1fd25bd6047b45cdcb1ab71a3d3bb0b36c71ec844a8742dee0bb34f8587fbd08"; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/jhthorsen/linkembedder"; + description = "Embed / expand oEmbed resources and other URL / links"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; + }; + LinuxACL = buildPerlPackage { pname = "Linux-ACL"; version = "0.05"; @@ -12362,6 +12394,22 @@ let }; }; + MojoliciousPluginWebpack = buildPerlPackage { + pname = "Mojolicious-Plugin-Webpack"; + version = "0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.12.tar.gz"; + sha256 = "2a0856e68446fc22b46692d9a6737f78467654f31e58ad1935e708bddf806d2c"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack"; + description = "Mojolicious <3 Webpack"; + license = stdenv.lib.licenses.artistic2; + maintainers = with maintainers; [ sgo ]; + }; + }; + MojoRedis = buildPerlPackage { pname = "Mojo-Redis"; version = "3.24"; @@ -14718,6 +14766,21 @@ let }; }; + ParseIRC = buildPerlPackage { + pname = "Parse-IRC"; + version = "1.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BI/BINGOS/Parse-IRC-1.22.tar.gz"; + sha256 = "457b09897f37d38a7054f9563247365427fe24101622ed4c7f054723a45b58d5"; + }; + meta = { + homepage = "https://github.com/bingos/parse-irc"; + description = "A parser for the IRC protocol"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + ParseLocalDistribution = buildPerlPackage { pname = "Parse-LocalDistribution"; version = "0.19"; @@ -20374,6 +20437,21 @@ let }; }; + TimePiece = buildPerlPackage { + pname = "Time-Piece"; + version = "1.3401"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ES/ESAYM/Time-Piece-1.3401.tar.gz"; + sha256 = "4b55b7bb0eab45cf239a54dfead277dfa06121a43e63b3fce0853aecfdb04c27"; + }; + meta = { + description = "Object Oriented time objects"; + homepage = "https://metacpan.org/release/Time-Piece"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + Tirex = buildPerlPackage rec { pname = "Tirex"; version = "0.6.1"; @@ -20635,6 +20713,22 @@ let }; }; + UnicodeUTF8 = buildPerlPackage { + pname = "Unicode-UTF8"; + version = "0.62"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Unicode-UTF8-0.62.tar.gz"; + sha256 = "fa8722d0b74696e332fddd442994436ea93d3bfc7982d4babdcedfddd657d0f6"; + }; + buildInputs = [ TestFatal ]; + meta = { + homepage = "https://github.com/chansen/p5-unicode-utf8"; + description = "Encoding and decoding of UTF-8 encoding form"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ sgo ]; + }; + }; + UnixGetrusage = buildPerlPackage { pname = "Unix-Getrusage"; version = "0.03"; From 042a2d8bafe4f1827dbb16ed4280fc737b162610 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 5 Jun 2020 14:53:24 +0200 Subject: [PATCH 471/624] nixos/convos: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/convos.nix | 72 ++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 nixos/modules/services/web-apps/convos.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0dba92f60c7e..fd6294f2d7c3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -831,6 +831,7 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/codimd.nix + ./services/web-apps/convos.nix ./services/web-apps/cryptpad.nix ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix diff --git a/nixos/modules/services/web-apps/convos.nix b/nixos/modules/services/web-apps/convos.nix new file mode 100644 index 000000000000..8be11eec9f31 --- /dev/null +++ b/nixos/modules/services/web-apps/convos.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.convos; +in +{ + options.services.convos = { + enable = mkEnableOption "Convos"; + listenPort = mkOption { + type = types.port; + default = 3000; + example = 8080; + description = "Port the web interface should listen on"; + }; + listenAddress = mkOption { + type = types.str; + default = "*"; + example = "127.0.0.1"; + description = "Address or host the web interface should listen on"; + }; + reverseProxy = mkOption { + type = types.bool; + default = false; + description = '' + Enables reverse proxy support. This will allow Convos to automatically + pick up the X-Forwarded-For and + X-Request-Base HTTP headers set in your reverse proxy + web server. Note that enabling this option without a reverse proxy in + front will be a security issue. + ''; + }; + }; + config = mkIf cfg.enable { + systemd.services.convos = { + description = "Convos Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + environment = { + CONVOS_HOME = "%S/convos"; + CONVOS_REVERSE_PROXY = if cfg.reverseProxy then "1" else "0"; + MOJO_LISTEN = "http://${toString cfg.listenAddress}:${toString cfg.listenPort}"; + }; + serviceConfig = { + ExecStart = "${pkgs.convos}/bin/convos daemon"; + Restart = "on-failure"; + StateDirectory = "convos"; + WorkingDirectory = "%S/convos"; + DynamicUser = true; + MemoryDenyWriteExecute = true; + ProtectHome = true; + ProtectClock = true; + ProtectHostname = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + LockPersonality = true; + RestrictRealtime = true; + RestrictNamespaces = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6"]; + SystemCallFilter = "@system-service"; + SystemCallArchitectures = "native"; + CapabilityBoundingSet = ""; + }; + }; + }; +} From a71fd5cb20b566e005ba1b47ed268d5d20ea8fa8 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 5 Jun 2020 14:54:29 +0200 Subject: [PATCH 472/624] nixos/convos: add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/convos.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nixos/tests/convos.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7056d414e9e9..2fbadd68be82 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -65,6 +65,7 @@ in containers-portforward = handleTest ./containers-portforward.nix {}; containers-restart_networking = handleTest ./containers-restart_networking.nix {}; containers-tmpfs = handleTest ./containers-tmpfs.nix {}; + convos = handleTest ./convos.nix {}; corerad = handleTest ./corerad.nix {}; couchdb = handleTest ./couchdb.nix {}; deluge = handleTest ./deluge.nix {}; diff --git a/nixos/tests/convos.nix b/nixos/tests/convos.nix new file mode 100644 index 000000000000..b4ff1188fd8b --- /dev/null +++ b/nixos/tests/convos.nix @@ -0,0 +1,30 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: + +with lib; +let + port = 3333; +in +{ + name = "convos"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ sgo ]; + }; + + nodes = { + machine = + { pkgs, ... }: + { + services.convos = { + enable = true; + listenPort = port; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("convos") + machine.wait_for_open_port("${toString port}") + machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'") + machine.succeed("curl http://localhost:${toString port}/") + ''; +}) From 7bbca84761b0ff53f0cc01b4b8f6e357b627012c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 22 Jun 2020 08:13:13 -0400 Subject: [PATCH 473/624] oh-my-zsh: 2020-06-18 -> 2020-06-19 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 37374900a4ec..84e3f2a7bffa 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-06-18"; + version = "2020-06-19"; pname = "oh-my-zsh"; - rev = "5ffc0d036c587741fd25092e7809dad2b00b3677"; + rev = "b706a919172955e16a1ab97f36a95b9ee4d9f1dc"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "04a9zg3l824wywk0qcm0pc4n4522cqljyix7kh3frc4psqnhh8qr"; + sha256 = "01mf36ndzh657x8kx0fpq66zq7zf6bpiv2pg5zs7z0lglkm0x9xx"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 3bdefc8802755057c473fa2a64e6d352b1e64bab Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 22 Jun 2020 13:47:53 +0100 Subject: [PATCH 474/624] qgis: 3.10.4 -> 3.10.7 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 2e11f22f517b..72e84620252f 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.4"; + version = "3.10.7"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0d1rsgjgnnq6jgms5bgppz8lkh4518nf90fk0qvxajdfi9j4jn12"; + sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf"; }; passthru = { From bc03b771fd2152f339ea9773e5e303032430c658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Mon, 22 Jun 2020 15:13:19 +0200 Subject: [PATCH 475/624] micro: install man page --- pkgs/applications/editors/micro/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index 438dec91d47d..4a8c176f5753 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoPackage rec { pname = "micro"; version = "2.0.5"; @@ -14,6 +14,8 @@ buildGoPackage rec { fetchSubmodules = true; }; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/micro" ]; buildFlagsArray = let t = "${goPackagePath}/internal/util"; in '' @@ -24,6 +26,10 @@ buildGoPackage rec { goDeps = ./deps.nix; + postInstall = '' + installManPage $src/assets/packaging/micro.1 + ''; + meta = with stdenv.lib; { homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; From f67b81ecbd883b663257b3eb8b4e142bada8af51 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 22 Jun 2020 15:35:16 +0200 Subject: [PATCH 476/624] freecad: use python 3.7 PySide2 5.12 is broken under Python 3.8. --- pkgs/top-level/all-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba020635053b..e3844d822845 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19860,7 +19860,11 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = qt5.callPackage ../applications/graphics/freecad { mpi = openmpi; }; + freecad = qt5.callPackage ../applications/graphics/freecad { + mpi = openmpi; + # pyside2 5.12 is broken under python 3.8 + python3Packages = python37Packages; + }; freemind = callPackage ../applications/misc/freemind { }; From b109addeef8c04c86bd33dc9de36c3d90cd0b9db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 22 Jun 2020 15:36:18 +0200 Subject: [PATCH 477/624] openttd-jgrpp: init at 0.34.4 --- pkgs/games/openttd/jgrpp.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/games/openttd/jgrpp.nix diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix new file mode 100644 index 000000000000..83a8f9276945 --- /dev/null +++ b/pkgs/games/openttd/jgrpp.nix @@ -0,0 +1,13 @@ +{ fetchFromGitHub, openttd, ... }: + +openttd.overrideAttrs (oldAttrs: rec { + pname = "openttd-jgrpp"; + version = "0.34.4"; + + src = fetchFromGitHub rec { + owner = "JGRennison"; + repo = "OpenTTD-patches"; + rev = "jgrpp-${version}"; + sha256 = "125mgia5hgcsn8314xyiip3z8y23rc3kdv7jczbncqlzsc75624v"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba020635053b..7ffc7f776862 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24061,6 +24061,11 @@ in static = true; }; }; + openttd-jgrpp = callPackage ../games/openttd/jgrpp.nix { + zlib = zlib.override { + static = true; + }; + }; opentyrian = callPackage ../games/opentyrian { }; From 6247f102802813d0c4fa89eb2cefde14292b9970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 22 Jun 2020 11:16:27 -0300 Subject: [PATCH 478/624] xfce.xfce4-eyes-plugin: 4.5.0 -> 4.5.1 --- pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 220e25068582..d8f612d1a81b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-eyes-plugin"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx"; + sha256 = "1iaszzkagl1mb0cdafrvlfjnjklhhs9y90517par34sjiqbq1dsd"; }; nativeBuildInputs = [ From ad32426b47eb2fc83b1e8b5c929971cd13a3f10c Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 22 Jun 2020 19:12:24 +0530 Subject: [PATCH 479/624] av-98: init at 1.0.2dev --- .../networking/browsers/av-98/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/applications/networking/browsers/av-98/default.nix diff --git a/pkgs/applications/networking/browsers/av-98/default.nix b/pkgs/applications/networking/browsers/av-98/default.nix new file mode 100644 index 000000000000..2184c8d699a4 --- /dev/null +++ b/pkgs/applications/networking/browsers/av-98/default.nix @@ -0,0 +1,21 @@ +{ lib, python3Packages, fetchgit }: + +python3Packages.buildPythonApplication rec { + pname = "av-98"; + version = "1.0.2dev"; + + src = fetchgit { + url = "https://tildegit.org/solderpunk/AV-98.git"; + rev = "96cf8e13fe5714c8cdc754f51eef9f0293b8ca1f"; + sha256 = "09iskh33hl5aaif763j1fmbz7yvf0yqsxycfd41scj7vbwdsbxl0"; + }; + + propagatedBuildInputs = with python3Packages; [ ansiwrap cryptography ]; + + meta = with lib; { + homepage = "https://tildegit.org/solderpunk/AV-98"; + description = "Experimental console client for the Gemini protocol"; + license = licenses.bsd2; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba020635053b..452df605cefb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18831,6 +18831,8 @@ in autotrace = callPackage ../applications/graphics/autotrace {}; + av-98 = callPackage ../applications/networking/browsers/av-98 { }; + avocode = callPackage ../applications/graphics/avocode {}; azpainter = callPackage ../applications/graphics/azpainter { }; From 2c3bf6b8f38f731033740c2a3ab15683ee07ab2f Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sat, 20 Jun 2020 20:35:09 +0200 Subject: [PATCH 480/624] cgminer: 3.7.2 -> 4.11.1 --- pkgs/applications/misc/cgminer/default.nix | 66 ++++++++++++---------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index 09236565d598..966303ec5a65 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -1,45 +1,49 @@ -{ fetchgit, stdenv, pkgconfig, libtool, autoconf, automake -, curl, ncurses, ocl-icd, opencl-headers, xorg, jansson }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, libtool +, autoconf +, automake +, curl +, ncurses +, ocl-icd +, opencl-headers +, libusb1 +, xorg +, jansson }: -stdenv.mkDerivation { - version = "3.7.2"; +stdenv.mkDerivation rec { pname = "cgminer"; + version = "4.11.1"; - src = fetchgit { - url = "https://github.com/ckolivas/cgminer.git"; - rev = "refs/tags/v3.7.2"; - sha256 = "1xfzx91dpwjj1vmhas3v9ybs0p2i74lrhinijmpav15acfggm9fq"; + src = fetchFromGitHub { + owner = "ckolivas"; + repo = "cgminer"; + rev = "v${version}"; + sha256 = "0l1ms3nxnjzh4mpiadikvngcr9k3jnjqy3yna207za0va0c28dj5"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - autoconf automake libtool curl ncurses ocl-icd opencl-headers - xorg.libX11 xorg.libXext xorg.libXinerama jansson - ]; + buildInputs = [ autoconf automake libtool curl ncurses ocl-icd opencl-headers + xorg.libX11 xorg.libXext xorg.libXinerama jansson libusb1 ]; + configureScript = "./autogen.sh"; - configureFlags = [ "--enable-scrypt" "--enable-opencl" ]; - NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; - - postBuild = '' - gcc api-example.c -o cgminer-api - ''; - - postInstall = '' - cp cgminer-api $out/bin/ - chmod 444 $out/bin/*.cl - ''; + configureFlags = [ "--enable-scrypt" + "--enable-opencl" + "--enable-bitforce" + "--enable-icarus" + "--enable-modminer" + "--enable-ztex" + "--enable-avalon" + "--enable-klondike" + "--enable-keccak" + "--enable-bflsc"]; meta = with stdenv.lib; { description = "CPU/GPU miner in c for bitcoin"; - longDescription= '' - This is a multi-threaded multi-pool GPU, FPGA and ASIC miner with ATI GPU - monitoring, (over)clocking and fanspeed support for bitcoin and derivative - coins. Do not use on multiple block chains at the same time! - ''; homepage = "https://github.com/ckolivas/cgminer"; license = licenses.gpl3; - maintainers = [ maintainers.offline ]; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; + maintainers = with maintainers; [ offline mmahut ]; + platforms = platforms.linux; }; } From 703bd0a609363cabc44b931e37b2fa4ee1492a15 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Mon, 22 Jun 2020 17:36:58 +0200 Subject: [PATCH 481/624] cgminer: moving to pkgs/applications/blockchains --- pkgs/applications/{misc => blockchains}/cgminer/default.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/{misc => blockchains}/cgminer/default.nix (100%) diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/blockchains/cgminer/default.nix similarity index 100% rename from pkgs/applications/misc/cgminer/default.nix rename to pkgs/applications/blockchains/cgminer/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14a494a164f5..4362c2051dde 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19054,8 +19054,6 @@ in inherit (python3Packages) python wrapPython pygments markdown; }; - cgminer = callPackage ../applications/misc/cgminer { }; - chirp = callPackage ../applications/radio/chirp { }; browsh = callPackage ../applications/networking/browsers/browsh { }; @@ -23432,6 +23430,8 @@ in bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots.nix { miniupnpc = miniupnpc_2; }; + cgminer = callPackage ../applications/blockchains/cgminer { }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; From 1b17b3b915fce00a1273a9b7247a4ebfb89a4d1d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 22 Jun 2020 01:35:00 +0200 Subject: [PATCH 482/624] nixos/doc: add section on Intel DDX drivers --- nixos/doc/manual/configuration/x-windows.xml | 41 ++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 110712baf5f1..ca93026d8654 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -96,6 +96,47 @@ The options are named identically for all other display managers. + + Intel Graphics drivers + + There are two choices for Intel Graphics drivers in X.org: + modesetting (included in the xorg-server itself) + and intel (provided by the package xf86-video-intel). + + + The default and recommended is modesetting. + It is a generic driver which uses the kernel + mode setting + (KMS) mechanism. It supports Glamor (2D graphics acceleration via OpenGL) + and is actively maintained but may perform worse in some cases (like in old chipsets). + + + The second driver, intel, is specific to Intel GPUs, + but not recommended by most distributions: it lacks several modern features + (for example, it doesn't support Glamor) and the package hasn't been officially + updated since 2015. + + + The results vary depending on the hardware, so you may have to try both drivers. + Use the option to set one. + The recommended configuration for modern systems is: + + = [ "modesetting" ]; + = true; + + If you experience screen tearing no matter what, this configuration was + reported to resolve the issue: + + = [ "intel" ]; + = '' + Option "DRI" "2" + Option "TearFree" "true" + ''; + + Note that this will likely downgrade the performance compared to + modesetting or intel with DRI 3 (default). + + Proprietary NVIDIA drivers From 22a81aa5fc15b2d41b12f7160a71cd4a9f3c3fa1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 15 Jun 2020 17:56:04 +0200 Subject: [PATCH 483/624] =?UTF-8?q?ocamlPackages.async=5Funix:=200.13.0=20?= =?UTF-8?q?=E2=86=92=200.13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.13.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix index 4682a744d6f5..d16ceefd04cc 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.13.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -357,7 +357,8 @@ rec { async_unix = janePackage { pname = "async_unix"; - hash = "0n3jz3qjlphyhkqgnbjbwf2fqxaksws82dx1mk4m4wnw3275gdi5"; + version = "0.13.1"; + hash = "1sb8grbj4bv6ih3yfdihxhn5c9rqczr56b5bhl85wy2mi92m17xv"; meta.description = "Monadic concurrency library"; propagatedBuildInputs = [ async_kernel core ]; }; From 3c3840ecd641489c6c0c6ddae2ba75c748a1457d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 22 Jun 2020 20:30:42 +0200 Subject: [PATCH 484/624] stellarium: 0.20.1 -> 0.20.2 https://github.com/Stellarium/stellarium/releases/tag/v0.20.2 --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 7ef7776c0fe8..78a7f7421748 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "1x8svan03k1x9jwqflimbpj7jpg6mjrbz26bg1sbhsqdlc8rbhky"; + sha256 = "0bpxv781chx5acjh9ni5l9dlnvn6jgkqylq09885g6j4gi3q56br"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; From 48faedc336be05f258c33f31313fcbedc0ca43c8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 22 Jun 2020 20:23:29 +0200 Subject: [PATCH 485/624] python3Packages.diceware: expose as library --- .../python-modules}/diceware/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) rename pkgs/{tools/security => development/python-modules}/diceware/default.nix (86%) diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix similarity index 86% rename from pkgs/tools/security/diceware/default.nix rename to pkgs/development/python-modules/diceware/default.nix index f32d63cfc10d..8e35eabfb0d7 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -1,10 +1,10 @@ -{ lib -, python3Packages +{ lib, buildPythonPackage, fetchPypi +, pytestrunner +, setuptools +, coverage, pytest }: -with python3Packages; - -buildPythonApplication rec { +buildPythonPackage rec { pname = "diceware"; version = "0.9.6"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff31fa43dbcc..30c81e06d093 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26779,7 +26779,7 @@ in simplehttp2server = callPackage ../servers/simplehttp2server { }; - diceware = callPackage ../tools/security/diceware { }; + diceware = with python3Packages; toPythonApplication diceware; xml2rfc = with python3Packages; toPythonApplication xml2rfc; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95c3fabc059d..56becb6b559d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -645,6 +645,8 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; + diceware = callPackage ../development/python-modules/diceware { }; + dictionaries = callPackage ../development/python-modules/dictionaries { }; diff_cover = callPackage ../development/python-modules/diff_cover { }; From ccc6486b368e6187e94d723744a72999e47fc5d7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Jun 2020 00:37:08 +0200 Subject: [PATCH 486/624] =?UTF-8?q?ocamlPackages.tls:=200.12.1=20=E2=86=92?= =?UTF-8?q?=200.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/tls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 0c3eaf33e782..222496fc6d10 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -4,14 +4,14 @@ , hacl_x25519, fiat-p256, hkdf, logs, alcotest }: buildDunePackage rec { - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; - version = "0.12.1"; + version = "0.12.2"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "09jhzjhni3il5bmy2c6gylmg9s45ppckjc7nm5nyg5dbm699cwxg"; + sha256 = "1wpgs0cd79wl4lnn1i44xjn8prha793nrbyv68zjiqpq3gmpyy3k"; }; useDune2 = true; From f1235e43c2197d71fabc77298297ed8997d9a8b1 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 16 Jun 2020 19:46:10 +0200 Subject: [PATCH 487/624] maestral: 0.6.4 -> 1.1.0 --- .../networking/maestral-qt/default.nix | 49 ++++++++++++++++ .../networking/maestral/default.nix | 57 ------------------- .../python-modules/maestral/default.nix | 57 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 2 + 5 files changed, 110 insertions(+), 59 deletions(-) create mode 100644 pkgs/applications/networking/maestral-qt/default.nix delete mode 100644 pkgs/applications/networking/maestral/default.nix create mode 100644 pkgs/development/python-modules/maestral/default.nix diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix new file mode 100644 index 000000000000..ea6303a3c34d --- /dev/null +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, fetchFromGitHub +, python3 +, wrapQtAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "maestral-qt"; + version = "1.1.0"; + disabled = python3.pkgs.pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "SamSchott"; + repo = "maestral-qt"; + rev = "v${version}"; + sha256 = "0clzzwwbrynfbvawhaaa4mp2qi8smng31mmz0is166z6g67bwdl6"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + bugsnag + click + markdown2 + maestral + pyqt5 + ]; + + nativeBuildInputs = [ wrapQtAppsHook ]; + + makeWrapperArgs = [ + # Firstly, add all necessary QT variables + "\${qtWrapperArgs[@]}" + + # Add the installed directories to the python path so the daemon can find them + "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "${python3.pkgs.maestral}/lib/${python3.libPrefix}/site-packages" + ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "GUI front-end for maestral (an open-source Dropbox client) for Linux"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix deleted file mode 100644 index fe611892ae6c..000000000000 --- a/pkgs/applications/networking/maestral/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, python3 -, withGui ? false -, wrapQtAppsHook ? null -}: - -python3.pkgs.buildPythonApplication rec { - pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.6.4"; - - disabled = python3.pkgs.pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "SamSchott"; - repo = "maestral-dropbox"; - rev = "v${version}"; - sha256 = "06psbjd205qj6vx7k7ywhclz1bs5zp43xnf275hf0k80h3b064sn"; - }; - - propagatedBuildInputs = with python3.pkgs; [ - blinker - bugsnag - click - dropbox - keyring - keyrings-alt - lockfile - pathspec - Pyro5 - requests - u-msgpack-python - watchdog - ] ++ lib.optionals stdenv.isLinux [ - sdnotify - systemd - ] ++ lib.optional withGui pyqt5; - - nativeBuildInputs = lib.optional withGui wrapQtAppsHook; - - postInstall = lib.optionalString withGui '' - makeQtWrapper $out/bin/maestral $out/bin/maestral-gui \ - --add-flags gui - ''; - - # no tests - doCheck = false; - - meta = with lib; { - description = "Open-source Dropbox client for macOS and Linux"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix new file mode 100644 index 000000000000..c7a4fc3f423a --- /dev/null +++ b/pkgs/development/python-modules/maestral/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, python +, blinker, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, u-msgpack-python, watchdog +, sdnotify +, systemd +}: + +buildPythonPackage rec { + pname = "maestral"; + version = "1.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "SamSchott"; + repo = "maestral"; + rev = "v${version}"; + sha256 = "0d1pxbg69ll07w4bbpzs7zz1yn82qyrym95b0mqmhrrg2ysxjngg"; + }; + + propagatedBuildInputs = [ + blinker + bugsnag + click + dropbox + fasteners + keyring + keyrings-alt + pathspec + Pyro5 + requests + u-msgpack-python + watchdog + ] ++ stdenv.lib.optionals stdenv.isLinux [ + sdnotify + systemd + ]; + + makeWrapperArgs = [ + # Add the installed directories to the python path so the daemon can find them + "--prefix" "PYTHONPATH" ":" "${stdenv.lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}" + "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages" + ]; + + # no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Open-source Dropbox client for macOS and Linux"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cd44c0372b0..b86672177962 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22170,9 +22170,9 @@ in dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { }; - maestral = callPackage ../applications/networking/maestral { }; + maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = libsForQt5.callPackage ../applications/networking/maestral { withGui = true; }; + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; insync = callPackage ../applications/networking/insync { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 56becb6b559d..1a7d87a9ae34 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4477,6 +4477,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; + maestral = callPackage ../development/python-modules/maestral { }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {}; From 43107040fe00e94541f0a2c52724bd0e2950afe5 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 21 Jun 2020 18:56:22 +0200 Subject: [PATCH 488/624] Pyro5: Disable more networking tests --- pkgs/development/python-modules/pyro5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 38730e7baaee..bb3c2c895b39 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; # ignore network related tests, which fail in sandbox - disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" ]; + disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ]; meta = with lib; { description = "Distributed object middleware for Python (RPC)"; From 259246cb75e7a25ba4edb062dc35e2bdf7243155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= Date: Mon, 22 Jun 2020 22:47:31 +0200 Subject: [PATCH 489/624] travis: 1.8.11 -> 1.9.1 (#91282) --- .../tools/misc/travis/Gemfile.lock | 50 ++++--- pkgs/development/tools/misc/travis/gemset.nix | 126 ++++++++++++++---- 2 files changed, 130 insertions(+), 46 deletions(-) diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index e26b31cbaf0c..91df15a9bb65 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -1,28 +1,38 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.4.0) - backports (3.16.1) - coderay (1.1.2) + activesupport (5.2.4.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + coderay (1.1.3) + concurrent-ruby (1.1.6) ethon (0.12.0) ffi (>= 1.3.0) - faraday (0.17.3) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - faraday_middleware (0.14.0) - faraday (>= 0.7.4, < 1.0) - ffi (1.12.2) - gh (0.15.1) - addressable (~> 2.4.0) - backports - faraday (~> 0.8) + faraday_middleware (1.0.0) + faraday (~> 1.0) + ffi (1.13.1) + gh (0.17.0) + activesupport (~> 5.0) + addressable (~> 2.4) + faraday (~> 1.0) + faraday_middleware (~> 1.0) multi_json (~> 1.0) net-http-persistent (~> 2.9) net-http-pipeline - highline (1.7.10) + highline (2.0.3) + i18n (1.8.3) + concurrent-ruby (~> 1.0) json (2.3.0) launchy (2.4.3) addressable (~> 2.3) method_source (0.9.2) + minitest (5.14.1) multi_json (1.14.1) multipart-post (2.1.1) net-http-persistent (2.9.4) @@ -30,20 +40,24 @@ GEM pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) + public_suffix (4.0.5) pusher-client (0.6.2) json websocket (~> 1.0) - travis (1.8.11) - backports - faraday (~> 0.9) - faraday_middleware (~> 0.9, >= 0.9.1) + thread_safe (0.3.6) + travis (1.9.1) + faraday (~> 1.0) + faraday_middleware (~> 1.0) gh (~> 0.13) - highline (~> 1.6) - launchy (~> 2.1) + highline (~> 2.0) + json (~> 2.3) + launchy (~> 2.1, < 2.5.0) pusher-client (~> 0.4) typhoeus (~> 0.6, >= 0.6.8) typhoeus (0.8.0) ethon (>= 0.8.0) + tzinfo (1.2.7) + thread_safe (~> 0.1) websocket (1.2.8) PLATFORMS diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix index da2f5e8e7ac8..e10475a916b1 100644 --- a/pkgs/development/tools/misc/travis/gemset.nix +++ b/pkgs/development/tools/misc/travis/gemset.nix @@ -1,31 +1,45 @@ { - addressable = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; - type = "gem"; - }; - version = "2.4.0"; - }; - backports = { + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sp3l5wa77klj34sqib95ppxyam53x3p57xk0y6gy2c3z29z6hs5"; + sha256 = "02fdawr3wyvpzpja3r7mvb8lmn2mm5jdw502bx3ncr2sy2nw1kx6"; type = "gem"; }; - version = "3.16.1"; + version = "5.2.4.3"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; }; coderay = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + type = "gem"; + }; + version = "1.1.6"; }; ethon = { dependencies = ["ffi"]; @@ -42,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13aghksmni2sl15y7wfpx6k5l3lfd8j9gdyqi6cbw6jgc7bqyyn2"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "0.17.3"; + version = "1.0.1"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -53,37 +67,52 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; type = "gem"; }; - version = "0.14.0"; + version = "1.0.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; gh = { - dependencies = ["addressable" "backports" "faraday" "multi_json" "net-http-persistent" "net-http-pipeline"]; + dependencies = ["activesupport" "addressable" "faraday" "faraday_middleware" "multi_json" "net-http-persistent" "net-http-pipeline"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg"; + sha256 = "1nj2dm2pahfa4d39y8csvjv5l3hpsm6yjq2y96vj2bqgg0qs26bj"; type = "gem"; }; - version = "0.15.1"; + version = "0.17.0"; }; highline = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; - version = "1.7.10"; + version = "2.0.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; + type = "gem"; + }; + version = "1.8.3"; }; json = { groups = ["default"]; @@ -114,6 +143,16 @@ }; version = "0.9.2"; }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + type = "gem"; + }; + version = "5.14.1"; + }; multi_json = { groups = ["default"]; platforms = []; @@ -159,6 +198,16 @@ }; version = "0.11.3"; }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; + type = "gem"; + }; + version = "4.0.5"; + }; pusher-client = { dependencies = ["json" "websocket"]; source = { @@ -168,16 +217,26 @@ }; version = "0.6.2"; }; - travis = { - dependencies = ["backports" "faraday" "faraday_middleware" "gh" "highline" "launchy" "pusher-client" "typhoeus"]; + thread_safe = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18zbi46as4d2wn83safawciyny0g2sk7yz5fvjvqmfk4ywpfrwrr"; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; }; - version = "1.8.11"; + version = "0.3.6"; + }; + travis = { + dependencies = ["faraday" "faraday_middleware" "gh" "highline" "json" "launchy" "pusher-client" "typhoeus"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yizj5nqvyrfbyiv1kfwc33dylhsmk5l007z06djj152v04z63i3"; + type = "gem"; + }; + version = "1.9.1"; }; typhoeus = { dependencies = ["ethon"]; @@ -188,6 +247,17 @@ }; version = "0.8.0"; }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; websocket = { source = { remotes = ["https://rubygems.org"]; From ebd7fab5218d49b4f028d8eb07c9c985a195c83b Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 22 Jun 2020 23:25:37 +0200 Subject: [PATCH 490/624] nginx-sso: 0.24.1 -> 0.25.0 --- pkgs/servers/nginx-sso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 769a8605f032..2e0b5a578bce 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nginx-sso"; - version = "0.24.1"; + version = "0.25.0"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "1wij0a5ban2l6ahfra4n4dji7i5ndkqk1mgrblwm2ski7bl8yszx"; + sha256 = "0z5h92rpr1rcfk11ggsb9w4ipg93fcb9byll7vl4c0mfcqkpm2dr"; }; postInstall = '' From ccb847f73513d7c4d522e9e7adae0817aa0bbde8 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Mon, 22 Jun 2020 23:33:34 +0200 Subject: [PATCH 491/624] wesnoth: 1.14.12 -> 1.14.13 --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 2eb45ded7e29..ce375392041e 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.12"; + version = "1.14.13"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "0xpypy0yfjmjp3apvlh51nm19p1cjhjw2p547kvmrckm7y6naaw8"; + sha256 = "1ka07h4sgmbc24qbaz0pbryx0yk339l4jzg32hy01qdvl2n40w3h"; }; nativeBuildInputs = [ cmake pkgconfig ]; From ac0e4d1b889056d35a887c417a5a211c1f00f875 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 23 Jun 2020 00:42:00 +0200 Subject: [PATCH 492/624] nginx-sso: add passthru.tests --- pkgs/servers/nginx-sso/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 2e0b5a578bce..dffe48db58a3 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, stdenv }: +{ buildGoPackage, fetchFromGitHub, stdenv, nixosTests }: buildGoPackage rec { pname = "nginx-sso"; @@ -19,6 +19,10 @@ buildGoPackage rec { cp -R $src/frontend $out/share ''; + passthru.tests = { + inherit (nixosTests) nginx-sso; + }; + meta = with stdenv.lib; { description = "SSO authentication provider for the auth_request nginx module"; homepage = "https://github.com/Luzifer/nginx-sso"; From e943489f24b0111f3d5150e8efe33ff7eb5b42da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Jun 2020 09:15:45 +0100 Subject: [PATCH 493/624] nixos-generate-config: refer to nixos-hardware --- nixos/modules/installer/tools/nixos-generate-config.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 422c405054d5..157dc28e0a83 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -628,6 +628,7 @@ EOF write_file($fn, < Date: Mon, 22 Jun 2020 16:24:41 -0700 Subject: [PATCH 494/624] libprom: init at 0.1.1 --- .../development/libraries/libprom/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/libprom/default.nix diff --git a/pkgs/development/libraries/libprom/default.nix b/pkgs/development/libraries/libprom/default.nix new file mode 100644 index 000000000000..b0c982fbf6a5 --- /dev/null +++ b/pkgs/development/libraries/libprom/default.nix @@ -0,0 +1,48 @@ +{ gccStdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: +let + stdenv = gccStdenv; # Darwin is clang by default and it doesn't work for this. +in +stdenv.mkDerivation rec { + pname = "libprom"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "digitalocean"; + repo = "prometheus-client-c"; + rev = "v${version}"; + sha256 = "0g69s24xwrv5974acshrhnp6i8rpby8c6bhz15m3d8kpgjw3cm8f"; + }; + + nativeBuildInputs = [ cmake ]; + doCheck = false; + + patches = [ + # Required so CMAKE_INSTALL_PREFIX is honored, otherwise it + # installs headers in /usr/include (absolute) + (fetchpatch { + url = "https://github.com/digitalocean/prometheus-client-c/commit/5fcedeb506b7d47dd7bab35797f2c3f23db6fe10.patch"; + sha256 = "10hzg8v5jcgxz224kdq0nha9vs78wz098b0ys7gig2iwgrg018fy"; + }) + (fetchpatch { + url = "https://github.com/digitalocean/prometheus-client-c/commit/0c15e7e45ad0c3726593591fdd7d8f2fde845fe3.patch"; + sha256 = "06899v1xz3lpsdxww4p3q7pv8nrymnibncdc472056znr5fidlp0"; + }) + ]; + + preConfigure = '' + cd prom + ''; + + meta = { + homepage = "https://github.com/digitalocean/prometheus-client-c/"; + description = "A Prometheus Client in C"; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.cfsmp3 ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff31fa43dbcc..234b05ed5820 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13427,6 +13427,8 @@ in libpqxx = callPackage ../development/libraries/libpqxx { }; + libprom = callPackage ../development/libraries/libprom { }; + libproxy = callPackage ../development/libraries/libproxy { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; }; From c61b5aa9682ca929cce776cbe1685a8ccce45dba Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 22 Jun 2020 20:51:46 -0400 Subject: [PATCH 495/624] epubcheck: 4.2.2 -> 4.2.3 --- pkgs/tools/text/epubcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index 914fe0067355..fe8330e9eb47 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "epubcheck"; - version = "4.2.2"; + version = "4.2.3"; src = fetchzip { url = "https://github.com/w3c/epubcheck/releases/download/v${version}/epubcheck-${version}.zip"; - sha256 = "0vz7k6i6y60ml20pbw2p9iqy6kxw4ziqszg6hbgz102x1jk8788d"; + sha256 = "0pqvqjc7vzvygddl8x4y0nqiwca883rh8lfqx0ml1a9gdhq0r5k4"; }; nativeBuildInputs = [ makeWrapper ]; From 05b765d299c44397a299004531bc1d5416413b1e Mon Sep 17 00:00:00 2001 From: Jade Harley Date: Mon, 22 Jun 2020 19:18:42 -0500 Subject: [PATCH 496/624] (rustup): (add zlib to rpath in rustup libraries) (Rust now has a dynamic library dependence on zlib. (see https://github.com/rust-lang/rust/pull/72696)) --- .../0001-dynamically-patchelf-binaries.patch | 27 ++++++++++--------- .../development/tools/rust/rustup/default.nix | 15 ++++++++--- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index d46ad59109e9..13649b387a3e 100644 --- a/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -1,30 +1,24 @@ diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs -index 4b432785..fa45e87e 100644 +index 3beddf54..0f859b8d 100644 --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs -@@ -109,10 +109,11 @@ impl Package for DirectoryPackage { - match &*part.0 { - "file" => { - if self.copy { -- builder.copy_file(path.clone(), &src_path)? -+ builder.copy_file(path.clone(), &src_path)?; +@@ -113,6 +113,7 @@ impl Package for DirectoryPackage { } else { -- builder.move_file(path.clone(), &src_path)? -+ builder.move_file(path.clone(), &src_path)?; + builder.move_file(path.clone(), &src_path)? } + nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path) } "dir" => { if self.copy { -@@ -135,6 +136,22 @@ impl Package for DirectoryPackage { +@@ -135,6 +136,29 @@ impl Package for DirectoryPackage { } } +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { -+ let is_bin = if let Some(p) = src_path.parent() { -+ p.ends_with("bin") ++ let (is_bin, is_lib) = if let Some(p) = src_path.parent() { ++ (p.ends_with("bin"), p.ends_with("lib")) + } else { -+ false ++ (false, false) + }; + + if is_bin { @@ -34,6 +28,13 @@ index 4b432785..fa45e87e 100644 + .arg(dest_path) + .output(); + } ++ else if is_lib { ++ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf") ++ .arg("--set-rpath") ++ .arg("@libPath@") ++ .arg(dest_path) ++ .output(); ++ } +} + #[derive(Debug)] diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 959eb6875ce3..688159445d5a 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, runCommand, patchelf , fetchFromGitHub, rustPlatform -, pkgconfig, curl, Security, CoreServices }: +, pkgconfig, curl, zlib, Security, CoreServices }: rustPlatform.buildRustPackage rec { pname = "rustup"; @@ -18,18 +18,25 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - curl + curl zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; } '' + (let + libPath = lib.makeLibraryPath [ + zlib # libz.so.1 + ]; + in + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ --subst-var patchelf \ - --subst-var dynamicLinker + --subst-var dynamicLinker \ + --subst-var libPath '') + ) ]; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; From 40903810b1baee4ff196f31ce3df004a2b4fd632 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Jun 2020 05:51:13 +0000 Subject: [PATCH 497/624] progress: 0.14 -> 0.15 --- pkgs/tools/misc/progress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index bbde732aadf5..a43101f607d5 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "progress"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl"; + sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"; }; nativeBuildInputs = [ pkgconfig which ]; From 061cae0dc620ee8c4ca00cf84833d2d830e940e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Jun 2020 05:59:55 +0000 Subject: [PATCH 498/624] psi-plus: 1.4.1231 -> 1.4.1407 --- .../networking/instant-messengers/psi-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index f45170250105..ba10ab162676 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.1231"; + version = "1.4.1407"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "0m5p8is8nk3g0cbwiq73cff9nn2y09fcnh1pzc6rlqqhmz1acg4i"; + sha256 = "0gp5rk7km2fzw109wil6s9x49x5q1qbw9mnkjs58dpzvxn74ylhw"; }; cmakeFlags = [ From 05eefe5ef8e0869f8b9a89219795f3997de19db5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 16 Jun 2020 08:15:23 +0200 Subject: [PATCH 499/624] =?UTF-8?q?coqPackages.simple-io:=201.2.0=20?= =?UTF-8?q?=E2=86=92=201.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/simple-io/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index 07ce35875d1f..bc020174daa4 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, coq, coq-ext-lib }: stdenv.mkDerivation rec { - version = "1.2.0"; + version = "1.3.0"; name = "coq${coq.coq-version}-simple-io-${version}"; src = fetchFromGitHub { owner = "Lysxia"; repo = "coq-simple-io"; rev = version; - sha256 = "1im1vwp7l7ha8swnhgbih0qjg187n8yx14i003nf6yy7p0ryxc9m"; + sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; }; buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml ocamlbuild ]); @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.7" "8.8" "8.9" "8.10" "8.11" ]; }; } From 0ffeccd89fd1d1aaeb1285827362179a3b9a4451 Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Wed, 8 Apr 2020 17:48:49 +0200 Subject: [PATCH 500/624] mlkit: init at 4.5.0 --- pkgs/development/compilers/mlkit/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/compilers/mlkit/default.nix diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix new file mode 100644 index 000000000000..6fa581452507 --- /dev/null +++ b/pkgs/development/compilers/mlkit/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, mlton }: + +stdenv.mkDerivation rec { + pname = "mlkit"; + version = "4.5.0"; + + src = fetchFromGitHub { + owner = "melsman"; + repo = "mlkit"; + rev = "v${version}"; + sha256 = "0fc0y40qphn02857fv2dvhwzzsvgixzchx9i6i0x80xfv7z68fbh"; + }; + + nativeBuildInputs = [ autoreconfHook mlton ]; + + buildFlags = ["mlkit" "mlkit_libs"]; + + meta = with stdenv.lib; { + description = "Standard ML Compiler and Toolkit"; + homepage = "https://elsman.com/mlkit/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ athas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c95d210ffe5d..314f23b07b77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9041,6 +9041,8 @@ in mkcl = callPackage ../development/compilers/mkcl {}; + mlkit = callPackage ../development/compilers/mlkit {}; + inherit (callPackage ../development/compilers/mlton {}) mlton20130715 mlton20180207Binary From da196d2bed671a97fdda3ee34e7febea03d50f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 23 Jun 2020 09:27:24 +0100 Subject: [PATCH 501/624] home-assistant: add hexa as maintainers https://github.com/NixOS/nixpkgs/pull/91273#issuecomment-647833500 --- pkgs/servers/home-assistant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 111c09d80290..0d9a3b256659 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -137,6 +137,6 @@ in with py.pkgs; buildPythonApplication rec { homepage = "https://home-assistant.io/"; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; - maintainers = with maintainers; [ dotlambda globin mic92 ]; + maintainers = with maintainers; [ dotlambda globin mic92 hexa ]; }; } From c72d7de7fe5448dceb730c45fc117ecd7b84fc9c Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Tue, 23 Jun 2020 11:12:50 +0200 Subject: [PATCH 502/624] just: remove dash dependency --- pkgs/development/tools/just/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 5fa2b12e9c39..1f11cac7bde2 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash +{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash , installShellFiles }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh --name _just completions/just.zsh ''; - checkInputs = [ coreutils bash dash ]; + checkInputs = [ coreutils bash ]; preCheck = '' # USER must not be empty From e4356601d3fd4fdca0c2aea679a32d19bcdad47a Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Thu, 18 Jun 2020 10:18:43 +0200 Subject: [PATCH 503/624] tests/taskserver: fix gnutls invocation test failed because gnutls-cli does not properly report connection errors any more, fixed by increasing the debug level for gnutls-cli Fixes: #84507 Closes: #90718 --- nixos/tests/taskserver.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index ab9b589f8593..9c07bcf9f51f 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -176,7 +176,8 @@ in { sub checkClientCert ($) { my $user = $_[0]; - my $cmd = "gnutls-cli". + # debug level 3 is a workaround for gnutls issue https://gitlab.com/gnutls/gnutls/-/issues/1040 + my $cmd = "gnutls-cli -d 3". " --x509cafile=/home/$user/.task/keys/ca.cert". " --x509keyfile=/home/$user/.task/keys/private.key". " --x509certfile=/home/$user/.task/keys/public.cert". From 0d8649c4e9b37e7343a8a613351ea9532671a944 Mon Sep 17 00:00:00 2001 From: pblkt Date: Tue, 23 Jun 2020 11:57:58 +0300 Subject: [PATCH 504/624] cue: 0.2.0 -> 0.2.1 --- pkgs/development/tools/cue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 65f47c837b83..4af8a7e90236 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cue"; - version = "0.2.0"; + version = "0.2.1"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "06kag5dwkq4zsh1b52b74g3slsxlwwiap2w3709qjhrgda8w2zn3"; + sha256 = "0v9ynbpv7q4lgi1q4qqvfn24z09z2l9lwqjldaffb4i04vyymdfx"; }; - vendorSha256 = "1lhjd98n9j1cq36b5lhscb7k32qmyqg7zs6zc8yab494bm8sz89g"; + vendorSha256 = "1s6mm3lsrs5vgvw4i4a3wxksd9wanbkjlahyz6hbnm3451ra0nyq"; subPackages = [ "cmd/cue" ]; From 880695f4c5a0cfef44f508395087ecfb850b9cef Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 23 Jun 2020 14:16:23 +0200 Subject: [PATCH 505/624] rakudo: 2020.05.1 -> 2020.06 dependencies: nqp: 2020.05 -> 2020.06 moarvm: 2020.05 -> 2020.06 --- pkgs/development/interpreters/rakudo/default.nix | 4 ++-- pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++-- pkgs/development/interpreters/rakudo/nqp.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 2833a4d5673a..4ad5bc14c352 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.05.1"; + version = "2020.06"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1m4xpghhgi7iijbzvr7bzkay7k93bwpvdg58jp31csrwdzz4q5z1"; + sha256 = "06kj8vfkkspmcdyd3zf2pyxwmijbbfnhv3jcaihvb8p3za5gxn2c"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index a7b57c9287ac..1cee0eaef63d 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.05"; + version = "2020.06"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "0jw29846nky7gz129knjcx58qr7nbn8j7hs8k92i11zaj73d4s4k"; + sha256 = "1hlxm5p1n9fclma2z9kynkxrknsxdihzkbsb3wxnvjvndzqmk5yv"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 40133287f9e0..15f0e0f9f588 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.05"; + version = "2020.06"; src = fetchurl { url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0xxm0vlra1g467cxc5v65p8pc46w7r9wkcddjl8nk2lnvgcr46r9"; + sha256 = "13wkhdxxs86wl6ahfzhyp45dy6hk6qnij3dm8d8893b2rxs377m4"; }; buildInputs = [ perl ]; From 21a21a422498c89d2c87ae07e390501318a5a9ea Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Fri, 19 Jun 2020 12:14:19 +0200 Subject: [PATCH 506/624] bazel: 3.2.0 -> 3.3.0 --- .../virtualization/gvisor/default.nix | 2 +- .../python-modules/dm-sonnet/default.nix | 2 +- .../tensorflow-probability/default.nix | 2 +- .../tools/bazel-watcher/default.nix | 2 +- .../bazel/bazel-remote/default.nix | 2 +- .../build-managers/bazel/bazel_3/default.nix | 8 +- .../bazel/bazel_3/src-deps.json | 90 +++++++++++++------ .../build-managers/bazel/update-srcDeps.py | 1 + 8 files changed, 73 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 74a408952a22..7d3b80212292 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -76,7 +76,7 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "164r8m95g7njh232xfc7zcn1nssaw9bnin9k7ssj9mk6z7z9zy5v"; + sha256 = "0mkgbw08f6kgklvjmlfpyld35q7dvxm9pvrhaf7m7nx69sich6jq"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index ffff1829948e..1f9c61e4ed40 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -36,7 +36,7 @@ let bazelTarget = ":install"; fetchAttrs = { - sha256 = "1xwrha692if7rwqc0qalgpx9b8indgdan8ppwlcs2v47wjvgg6h3"; + sha256 = "1gag2xghik68zblhwbdd206hs8nxp2sclw182x2qi78jqgfnq5ci"; }; bazelFlags = [ diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 21ce440c630a..9466b85a6a4a 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -61,7 +61,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "1snj7fxfxzvrqv9cpir1daxcg3fip6cvbk94y3mi2h50k3ni826i"; + sha256 = "1bh6lsi0732fzhrfs6p33qg2qfvq73r6qmijbpnv592aq8yiy1h5"; }; buildAttrs = { diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index f331272a5f31..1d86b80a50bd 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -56,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "16zgjd6zww9skk34ggfx5l3kbsdyv98zxawrvmx1arv5gaj63pp9"; + sha256 = "17vdqs3dpaqc4llmzh4rd8mkm19q192w5gp90jlry3dpwj6b4kdf"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index d615657ebeb4..5a8094af48af 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -64,7 +64,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0rfjyvw370yn4rp1f2772b2h3jbycymdw26zx38krzy5zq0iajyp"; + sha256 = "04wbimzjxxmm8kh57q11zvyardb6ilyffc4nkdp6mb87p1l8fmww"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 77caa2325622..85492033e391 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -25,11 +25,11 @@ }: let - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1ylbfdcb6rhnc3sr292c6shl754i0h0i050f4gr4bppn6sa15v24"; + sha256 = "09p8xv8ni4g4wcyaapxsx8gjc3x3l3c6lxn575c7gm89vrh3k805"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -53,8 +53,8 @@ let else srcs."java_tools_javac11_linux-v8.0.zip") srcs."coverage_output_generator-v2.1.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.16.0.tar.gz" - srcs."3.1.0.tar.gz" + srcs."android_tools_pkg-0.17.0.tar.gz" + srcs."bazel-toolchains-3.1.0.tar.gz" srcs.rules_pkg srcs.rules_cc srcs.rules_java diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json index 786a31c9bb31..49269bbde5bc 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/src-deps.json @@ -7,6 +7,14 @@ "https://github.com/bazelbuild/rules_sass/archive/1.25.0.zip" ] }, + "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz": { + "name": "1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" + ] + }, "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": { "name": "2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz", "sha256": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96", @@ -15,14 +23,6 @@ "https://github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz" ] }, - "3.1.0.tar.gz": { - "name": "3.1.0.tar.gz", - "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" - ] - }, "46993efdd33b73649796c5fc5c9efb193ae19d51.zip": { "name": "46993efdd33b73649796c5fc5c9efb193ae19d51.zip", "sha256": "66184688debeeefcc2a16a2f80b03f514deac8346fe888fb7e691a52c023dd88", @@ -65,14 +65,22 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz" + "sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz" }, - "android_tools_pkg-0.16.0.tar.gz": { - "name": "android_tools_pkg-0.16.0.tar.gz", - "sha256": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361", + "android_tools_pkg-0.17.0.tar.gz": { + "name": "android_tools_pkg-0.17.0.tar.gz", + "sha256": "8d0bf8ab83c9e38ec6ed5ce7bf425dbdc6469cec9e078559d4e8da42b705410f", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.17.0.tar.gz" + ] + }, + "bazel-toolchains-3.1.0.tar.gz": { + "name": "bazel-toolchains-3.1.0.tar.gz", + "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" ] }, "bazel_j2objc": { @@ -114,10 +122,19 @@ "sha256": "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2", "strip_prefix": "bazel-toolchains-3.1.0", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/3.1.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz", "https://github.com/bazelbuild/bazel-toolchains/releases/download/3.1.0/bazel-toolchains-3.1.0.tar.gz" ] }, + "bazel_website": { + "build_file_content": "\nexports_files([\"_sass/style.scss\"])\n", + "name": "bazel_website", + "sha256": "a5f531dd1d62e6947dcfc279656ffc2fdf6f447c163914c5eabf7961b4cb6eb4", + "strip_prefix": "bazel-website-c174fa288aa079b68416d2ce2cc97268fa172f42", + "urls": [ + "https://github.com/bazelbuild/bazel-website/archive/c174fa288aa079b68416d2ce2cc97268fa172f42.tar.gz" + ] + }, "build_bazel_rules_nodejs": { "name": "build_bazel_rules_nodejs", "sha256": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37", @@ -126,14 +143,6 @@ "https://github.com/bazelbuild/rules_nodejs/releases/download/1.3.0/rules_nodejs-1.3.0.tar.gz" ] }, - "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz": { - "name": "c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7", - "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" - ] - }, "com_google_googletest": { "name": "com_google_googletest", "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", @@ -201,11 +210,11 @@ }, "io_bazel_skydoc": { "name": "io_bazel_skydoc", - "sha256": "e6a76586b264f30679688f65f7e71ac112d1446681010a13bf22d9ca071f34b7", - "strip_prefix": "skydoc-c7bbde2950769aac9a99364b0926230060a3ce04", + "sha256": "5a725b777976b77aa122b707d1b6f0f39b6020f66cd427bb111a585599c857b1", + "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz", - "https://github.com/bazelbuild/skydoc/archive/c7bbde2950769aac9a99364b0926230060a3ce04.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz", + "https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz" ] }, "java_tools_javac11_darwin-v8.0.zip": { @@ -337,6 +346,15 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689068.tar.gz" ] }, + "openjdk_linux_ppc64le_vanilla": { + "downloaded_file_path": "adoptopenjdk-ppc64le-vanilla.tar.gz", + "name": "openjdk_linux_ppc64le_vanilla", + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, "openjdk_linux_vanilla": { "downloaded_file_path": "zulu-linux-vanilla.tar.gz", "name": "openjdk_linux_vanilla", @@ -589,6 +607,24 @@ "https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-linux_x64.tar.gz" ] }, + "remotejdk11_linux_ppc64le_for_testing": { + "build_file": "@local_jdk//:BUILD.bazel", + "name": "remotejdk11_linux_ppc64le_for_testing", + "patch_cmds": [ + "test -f BUILD.bazel && chmod u+w BUILD.bazel || true", + "echo >> BUILD.bazel", + "echo 'exports_files([\"WORKSPACE\"], visibility = [\"//visibility:public\"])' >> BUILD.bazel" + ], + "patch_cmds_win": [ + "Add-Content -Path BUILD.bazel -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" + ], + "sha256": "a417db0295b1f4b538ecbaf7c774f3a177fab9657a665940170936c0eca4e71a", + "strip_prefix": "jdk-11.0.7+10", + "urls": [ + "https://mirror.bazel.build/openjdk/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz", + "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7%2B10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz" + ] + }, "remotejdk11_macos_for_testing": { "build_file": "@local_jdk//:BUILD.bazel", "name": "remotejdk11_macos_for_testing", diff --git a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py index e57dc05bb72a..52d40e0f94e8 100755 --- a/pkgs/development/tools/build-managers/bazel/update-srcDeps.py +++ b/pkgs/development/tools/build-managers/bazel/update-srcDeps.py @@ -35,6 +35,7 @@ def list_source_repository(**kw): pass def new_local_repository(**kw): pass def local_repository(**kw): pass DOC_VERSIONS = [] +def stardoc_repositories(**kw): pass def skydoc_repositories(**kw): pass def rules_sass_dependencies(**kw): pass def node_repositories(**kw): pass From dec248b07f8a1f650e148dc632992630de473496 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 23 Jun 2020 14:46:38 +0200 Subject: [PATCH 507/624] searx: fix werkzeug.contrib import --- pkgs/servers/web-apps/searx/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index bcfa8a410219..730e5c41bbf2 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, fetchpatch }: with python3Packages; @@ -14,6 +14,11 @@ buildPythonApplication rec { sha256 = "0hfa4nmis98yvghxw866rzjpmhb2ln8l6l8g9yx4m79b2lk76xcs"; }; + patches = [(fetchpatch { + url = "https://github.com/asciimoo/searx/commit/b8b13372c8fd3bfe978a1c724ab98b05348df054.patch"; + sha256 = "1zc3dx8pgqfg0bj48ihckjk9xrrm33jlnmj8k02g17gfcmj7566a"; + })]; + postPatch = '' substituteInPlace requirements.txt \ --replace 'certifi==2019.3.9' 'certifi' \ From 39e3c15706c8e68fb37d3c71074dabe34cfb3a1e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 23 Jun 2020 15:57:22 +0200 Subject: [PATCH 508/624] hydra-unstable: 2020-06-01 -> 2020-06-23 Fixes the build the changes from b505bf202b0c23e3bd22d2555d79d6fbb2fa498c. --- pkgs/development/tools/misc/hydra/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index fb884c8ffac5..680e10d662a7 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }: { # Package for phase-1 of the db migration for Hydra. @@ -24,22 +24,15 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-06-01"; + version = "2020-06-23"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a"; - sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4"; + rev = "bb32aafa4a9b027c799e29b1bcf68727e3fc5f5b"; + sha256 = "0kl9h70akwxpik3xf4dbbh7cyqn06023kshfvi14mygdlb84djgx"; }; nix = nixFlakes; - patches = [ - (fetchpatch { - url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch"; - sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w"; - }) - ]; - tests = { db-migration = nixosTests.hydra-db-migration.mig; basic = nixosTests.hydra.hydra-unstable; From f877a9abb8976a4ad70d3034b81c39a7b27bfde5 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 23 Jun 2020 14:20:45 +0200 Subject: [PATCH 509/624] kitty: 0.18.0 -> 0.18.1 https://github.com/kovidgoyal/kitty/releases/tag/v0.18.1 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 12db0cd87e98..85e9795a0361 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.18.0"; + version = "0.18.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "15i4ld65a5rfbaxxdh6kgg9h0ih73iqjskk82h8j72qgzkc6g3hf"; + sha256 = "1g4mfgygyl143k0k6d3cb8b2l05ahiamlcqs1iqi66pc73cax4z6"; }; buildInputs = [ From 517be841352ec3e6b236e7cdfb1fbd8e26bf49cb Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 23 Jun 2020 15:59:14 +0200 Subject: [PATCH 510/624] small treewide: his -> theirs/its SJW brigade represent. ;) Co-authored-by: Jan Tojnar --- nixos/modules/config/users-groups.nix | 2 +- nixos/modules/services/networking/3proxy.nix | 2 +- nixos/tests/sudo.nix | 2 +- pkgs/applications/audio/pamixer/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 7fbbfcec7510..8defa86818ab 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -626,7 +626,7 @@ in { then '' The password hash of user "${name}" may be invalid. You must set a - valid hash or the user will be locked out of his account. Please + valid hash or the user will be locked out of their account. Please check the value of option `users.users."${name}".hashedPassword`. '' else null diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix index ae8a4958ca96..37a48657c1cc 100644 --- a/nixos/modules/services/networking/3proxy.nix +++ b/nixos/modules/services/networking/3proxy.nix @@ -124,7 +124,7 @@ in { "iponly": specifies no authentication. ACLs authorization is used. - "strong": authentication by username/password. If user is not registered his access is denied regardless of ACLs. + "strong": authentication by username/password. If user is not registered their access is denied regardless of ACLs. diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 5bbec3d57269..8c38f1b47ef0 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -74,7 +74,7 @@ in with subtest("test5 user should not be able to run commands under root"): machine.fail("sudo -u test5 sudo -n -u root true") - with subtest("test5 user should be able to keep his environment"): + with subtest("test5 user should be able to keep their environment"): machine.succeed("sudo -u test5 sudo -n -E -u test1 true") with subtest("users in group 'barfoo' should not be able to keep their environment"): diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 71d852485991..3e2192c04148 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Pulseaudio command line mixer"; longDescription = '' Features: - - Get the current volume of the default sink, the default source or a selected one by his id + - Get the current volume of the default sink, the default source or a selected one by its id - Set the volume for the default sink, the default source or any other device - List the sinks - List the sources From c1e8f5c825e71baca034ed28c9bf9bcd3cbcfb64 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 23 Jun 2020 17:09:28 +0200 Subject: [PATCH 511/624] riot-web: 1.6.5 -> 1.6.6 https://github.com/vector-im/riot-web/releases/tag/v1.6.6 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index cc4eb4161f1b..86aa4c927664 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0mx7ql76cbivc0d9gzix51bc1rdp9yg9vjx05mbf5r9sxrwmihz5"; + sha256 = "0j88wcha5rr6qaxik4m90v9mgfcj3r9nb4gpd2dzi7m1zf7kivkw"; }; installPhase = '' From ea13f90b5fd4de6a4e7b72c9c7f8970e7373613f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 23 Jun 2020 17:09:52 +0200 Subject: [PATCH 512/624] riot-desktop: 1.6.5 -> 1.6.6 https://github.com/vector-im/riot-desktop/releases/tag/v1.6.6 --- .../riot/riot-desktop-package.json | 11 ++--- .../riot/riot-desktop-yarndeps.nix | 40 +++++++++++++------ .../instant-messengers/riot/riot-desktop.nix | 4 +- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index f9a5ebdbebe3..6280bfdf4c71 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-desktop", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.6.5", + "version": "1.6.6", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -48,17 +48,18 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-js-sdk": "6.2.2", + "matrix-js-sdk": "7.0.0", "mkdirp": "^1.0.3", - "needle": "^2.3.2", - "node-pre-gyp": "^0.14.0", + "needle": "^2.5.0", + "node-pre-gyp": "^0.15.0", "npm": "^6.13.7", "rimraf": "^3.0.2", "semver": "^7.1.3", "tar": "^6.0.1" }, "hakDependencies": { - "matrix-seshat": "^1.3.3" + "matrix-seshat": "^1.3.3", + "keytar": "^5.6.0" }, "build": { "appId": "im.riot.app", diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index 30e1c9464755..2fa0303ae05b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -3154,11 +3154,11 @@ }; } { - name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; + name = "matrix_js_sdk___matrix_js_sdk_7.0.0.tgz"; path = fetchurl { - name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz"; - sha1 = "103d951f61945217b110962f55ae43996756f615"; + name = "matrix_js_sdk___matrix_js_sdk_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-7.0.0.tgz"; + sha1 = "da2b24e57574379c3d8f7065eb68ea6c479d9806"; }; } { @@ -3273,6 +3273,14 @@ sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f"; }; } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } { name = "minipass___minipass_2.9.0.tgz"; path = fetchurl { @@ -3321,6 +3329,14 @@ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } { name = "mkdirp___mkdirp_1.0.3.tgz"; path = fetchurl { @@ -3378,11 +3394,11 @@ }; } { - name = "needle___needle_2.3.2.tgz"; + name = "needle___needle_2.5.0.tgz"; path = fetchurl { - name = "needle___needle_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz"; - sha1 = "3342dea100b7160960a450dc8c22160ac712a528"; + name = "needle___needle_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.5.0.tgz"; + sha1 = "e6fc4b3cc6c25caed7554bd613a5cf0bac8c31c0"; }; } { @@ -3410,11 +3426,11 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; + name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz"; path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; - sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83"; + name = "node_pre_gyp___node_pre_gyp_0.15.0.tgz"; + url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz"; + sha1 = "c2fc383276b74c7ffa842925241553e8b40f1087"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index b05f64c13822..72ec6e83ca68 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -8,12 +8,12 @@ let executableName = "riot-desktop"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "vector-im"; repo = "riot-desktop"; rev = "v${version}"; - sha256 = "1snmfn98z63a8ahh5c7y7h00i8qsdq6wsnidmjjrkzcz3mchfq60"; + sha256 = "0yrybi6cv3lj0fq4ab4rzjm9l4flfw97hkwzlp7zzixb3z9h09h8"; }; electron = electron_7; From f09718c84abae8fa8d45a2cb7fbf128f9b259d50 Mon Sep 17 00:00:00 2001 From: Tim Zook Date: Wed, 27 May 2020 13:48:05 -0500 Subject: [PATCH 513/624] sublime-merge: askpass bug fix Replace ssh-askpass-sublime executable from sublime-merge that is incompatable with the nix package wrapper. Fixes NixOS/nixpkgs#88600 --- .../version-management/sublime-merge/common.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index f20ebbeae3f9..ad540c46411d 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -67,6 +67,16 @@ in let --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} \ --set LOCALE_ARCHIVE "${glibcLocales.out}/lib/locale/locale-archive" \ "''${gappsWrapperArgs[@]}" + + # We need to replace the ssh-askpass-sublime executable because the default one + # will not function properly, in order to work it needs to pass an argv[0] to + # the sublime_merge binary, and the built-in version will will try to call the + # sublime_merge wrapper script which cannot pass through the original argv[0] to + # the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is + # very simple and can be replaced with a simple wrapper script. + rm $out/ssh-askpass-sublime + makeWrapper $out/.${primaryBinary}-wrapped $out/ssh-askpass-sublime \ + --argv0 "/ssh-askpass-sublime" ''; }; in stdenv.mkDerivation (rec { From 4e1800c8d364acaffd9cdf4beee4950381c42283 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:17:55 -0400 Subject: [PATCH 514/624] linux: 4.14.184 -> 4.14.185 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 7ee05ed47ded..62dac23d72e7 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.184"; + version = "4.14.185"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0h6r06c1d7amkfglsr66ic89p0zxpmk7jkq1ylcbknmkiwkixx9g"; + sha256 = "1iixxwidp53s2i2br58wbx5s69f2jcllb116z73pv7fmd06b2czk"; }; } // (args.argsOverride or {})) From c8ff55474c8112d992ac2a5e9fb2325d3fa99145 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:18:07 -0400 Subject: [PATCH 515/624] linux: 4.19.128 -> 4.19.129 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 92281ffdd3e6..d33038fe5670 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.128"; + version = "4.19.129"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0g31ad3wziy4xqna0yvwjcnza3jhd93syjpfvmwh0b4pkj2adar9"; + sha256 = "0p0apfviv699mda5zmqphymfybcm932s5yffhvrpqvy2fpas0yx8"; }; } // (args.argsOverride or {})) From 14b7f40eef54508fd0efe5c7e2fa5dae0c41a7eb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:18:16 -0400 Subject: [PATCH 516/624] linux: 4.4.227 -> 4.4.228 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index fe0406233169..59c86a5e1415 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.227"; + version = "4.4.228"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "196x57w740firg8zchypq4vq6a83ymmwn9amqrscym9zr0pcgm40"; + sha256 = "0y1xc5lk8j3p5maarksmh18wy921rgcngzsih7q1a82rah1fsjxr"; }; } // (args.argsOverride or {})) From a6dd26a2e801bb4b71f19ce6d890ed73ae2b21c4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:18:28 -0400 Subject: [PATCH 517/624] linux: 4.9.227 -> 4.9.228 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 5be2d7ac9bd9..9afd8686c193 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.227"; + version = "4.9.228"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pqc0wld4s4zjas95xm54mrkk00l9zkc59b6i9gq4km126s8bi1q"; + sha256 = "0d7w2zzs79ywxzfrh4bmk5lw318qbkcb8mcsyyh3cc25qqlz9gwg"; }; } // (args.argsOverride or {})) From e91884621654c28d2f394b81afa0969619b113da Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:18:38 -0400 Subject: [PATCH 518/624] linux: 5.4.47 -> 5.4.48 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index a2fbbbe37349..006f469aa988 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.47"; + version = "5.4.48"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0v4d86yci4lq82nb1fgf0g3j0348v6q6m77czpm4b3cs7lwrs2wp"; + sha256 = "0lqxryxn0bfly337ddhl7m7qdwblxg8i1fsl8v9i9h84rnpxs85z"; }; } // (args.argsOverride or {})) From c4a784bbf43119d5fa925e2524d2586088dd5397 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:18:46 -0400 Subject: [PATCH 519/624] linux: 5.7.4 -> 5.7.5 --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index c299cc098722..2f0223b59d02 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.4"; + version = "5.7.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "06mm0bmjw54aypfhhbm9aaz5bmgymvygfak587iwv901635gb95w"; + sha256 = "008bpcvcdbwy3w829zc0s6ighn820nr51y24l6df5qfvah1zjdvc"; }; } // (args.argsOverride or {})) From 91b3fe57531356627d668c50c3da301fafe09520 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:19:02 -0400 Subject: [PATCH 520/624] linux/hardened/patches/4.14: 4.14.184.a -> 4.14.185.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 654615ebe500..1cff5d109b41 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.184.a.patch", - "sha256": "1g12kz6ikdwp6b7000pfy3myga90mvxyl04b9267fk88jwih6yhk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.184.a/linux-hardened-4.14.184.a.patch" + "name": "linux-hardened-4.14.185.a.patch", + "sha256": "0kj18z2mbffnc0zksg7bfyy3hljiga0gzk0s3axvbxlp41vpvwp3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.185.a/linux-hardened-4.14.185.a.patch" }, "4.19": { "name": "linux-hardened-4.19.128.a.patch", From d6ea499873f7b14fddd190e213919d1b0c3cd4ec Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:19:04 -0400 Subject: [PATCH 521/624] linux/hardened/patches/4.19: 4.19.128.a -> 4.19.129.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 1cff5d109b41..4fc7b87662ee 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.185.a/linux-hardened-4.14.185.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.128.a.patch", - "sha256": "19ayzx9rf4j31ypavxwamd290lm95wmi7v165avxslahnx6pdsxs", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.128.a/linux-hardened-4.19.128.a.patch" + "name": "linux-hardened-4.19.129.a.patch", + "sha256": "0fyz4m2ih8biadziiqbyq4ddx8asn65z94wwrhi7krjqxlbdzgvs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.129.a/linux-hardened-4.19.129.a.patch" }, "5.4": { "name": "linux-hardened-5.4.46.a.patch", From 34393bcf19e3f3e50571ad7b81fe8eeb636c652e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:19:07 -0400 Subject: [PATCH 522/624] linux/hardened/patches/5.4: 5.4.46.a -> 5.4.48.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4fc7b87662ee..561049839f2f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.129.a/linux-hardened-4.19.129.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.46.a.patch", - "sha256": "0f2d53na7g6dhiba2ym09lm4fp3hwm6kw6mpm5jk46jmb6j7iwk5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.46.a/linux-hardened-5.4.46.a.patch" + "name": "linux-hardened-5.4.48.a.patch", + "sha256": "0vcy64gl88l12rqv0z3g8858zdr82a68sfalaf768j4z537bpany", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.48.a/linux-hardened-5.4.48.a.patch" }, "5.6": { "name": "linux-hardened-5.6.18.a.patch", From 9507dfbe8201340d2603040fdeb0f2f860ec405e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 23 Jun 2020 11:19:09 -0400 Subject: [PATCH 523/624] linux/hardened/patches/5.6: 5.6.18.a -> 5.6.19.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 561049839f2f..9fbe914f266d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -15,8 +15,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.48.a/linux-hardened-5.4.48.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.18.a.patch", - "sha256": "0idvgjg7kji4w3341acfqywi0qqn3pvxcmiz70cd7inhlqaqrw63", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.18.a/linux-hardened-5.6.18.a.patch" + "name": "linux-hardened-5.6.19.a.patch", + "sha256": "0gxdbcig6hpjxj6qr4lrj773gb76s0xlkrk3hclxk4ms6p82y4mm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.19.a/linux-hardened-5.6.19.a.patch" } } From 72cfe09e7f5c1c30514cfa964ebeab60d4325be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 23 Jun 2020 19:48:25 +0200 Subject: [PATCH 524/624] drawio: 13.2.2 -> 13.3.1 Changelog: https://github.com/jgraph/drawio-desktop/releases/tag/v13.3.1 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 7026d133658f..03ecbf3a4327 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.2.2"; + version = "13.3.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "0npqw4ih047d9s1yyllcvcih2r61fgji4rvzsw88r02mj5q5rgdn"; + sha256 = "0zvxmqqbgfxad1n9pa4h99l8hys486wziw5yyndxbv1v80p55p0p"; }; nativeBuildInputs = [ From c07a6f8743334fe92f6f7edbb2531e44e2032a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Tue, 23 Jun 2020 20:51:02 +0200 Subject: [PATCH 525/624] nixos/generic-extlinux-compatible: fix docbook syntax --- .../system/boot/loader/generic-extlinux-compatible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix index 416f8aeb1d38..bd508bbe8eaa 100644 --- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix +++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix @@ -44,7 +44,7 @@ in readOnly = true; description = '' Contains the builder command used to populate an image, - honoring all options except the -c + honoring all options except the -c <path-to-default-configuration> argument. Useful to have for sdImage.populateRootCommands ''; From 12b0644a20f000972e97728f049e2555a4003b28 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 23 Jun 2020 15:53:38 -0400 Subject: [PATCH 526/624] pythonPackages.flask-reverse-proxy-fix: fix build --- .../python-modules/flask-reverse-proxy-fix/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix index d6912de6fe86..f8001bc2aff5 100644 --- a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , isPy3k , flask +, werkzeug }: buildPythonPackage rec { @@ -20,8 +21,13 @@ buildPythonPackage rec { disabled = !isPy3k; + postPatch = '' + sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py + ''; + propagatedBuildInputs = [ flask + werkzeug ]; meta = with stdenv.lib; { From ba09be4c69d0e09dde774243696cfd26b69c5b09 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 23 Jun 2020 15:54:13 -0400 Subject: [PATCH 527/624] pythonPackages.geoalchemy2: fix build --- pkgs/development/python-modules/geoalchemy2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 892b373f065c..ea673dc33468 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -3,6 +3,8 @@ , fetchPypi , sqlalchemy , shapely +, setuptools_scm +, pytest }: buildPythonPackage rec { @@ -14,8 +16,12 @@ buildPythonPackage rec { sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9"; }; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sqlalchemy shapely ]; + # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst + doCheck = false; + meta = with stdenv.lib; { homepage = "http://geoalchemy.org/"; license = licenses.mit; From d1795bbb69fc2035b379edc805ef90733fa23b0c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 23 Jun 2020 15:54:37 -0400 Subject: [PATCH 528/624] pythonPackages.flask-admin: fix build --- .../python-modules/flask-admin/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 5803d8ea2c7d..dc1e795054fe 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -8,12 +8,16 @@ , wtf-peewee , sqlalchemy , sqlalchemy-citext +, sqlalchemy-utils , flask-mongoengine , flask_sqlalchemy , flask-babelex , shapely , geoalchemy2 , psycopg2 +, arrow +, colour +, email_validator , flask , wtforms , isPy27 @@ -22,12 +26,12 @@ buildPythonPackage rec { pname = "flask-admin"; - version = "1.5.3"; + version = "1.5.6"; src = fetchPypi { pname = "Flask-Admin"; inherit version; - sha256 = "ca0be6ec11a6913b73f656c65c444ae5be416c57c75638dd3199376ce6bc7422"; + sha256 = "1f31vzc0p2xni5mh1wvjk9jxf4ddlx2fj4r0f3vv2n9db3c63iv8"; }; checkInputs = [ @@ -38,12 +42,16 @@ buildPythonPackage rec { wtf-peewee sqlalchemy sqlalchemy-citext + sqlalchemy-utils flask-mongoengine flask_sqlalchemy flask-babelex shapely geoalchemy2 psycopg2 + arrow + colour + email_validator ]; propagatedBuildInputs = [ @@ -52,13 +60,14 @@ buildPythonPackage rec { ] ++ lib.optionals isPy27 [ enum34 ]; checkPhase = '' - # disable tests that require mongodb, postresql + # disable tests that require mongodb, postresql, or network nosetests \ -e "mongoengine" \ -e "pymongo" \ -e "test_form_upload" \ -e "test_postgres" \ -e "geoa" \ + -e "test_ajax_fk" \ flask_admin/tests ''; From af36ff22eabdbd7d08e70e8a12cde95f3020f807 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 23 Jun 2020 15:54:44 -0400 Subject: [PATCH 529/624] buku: 4.3 -> 4.4 --- pkgs/applications/misc/buku/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index f4018cff5f43..9b8f531e800e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "4.3"; + version = "4.4"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1cq508ymak3g5fhi1n4bdiiqkc86s2l3k4dvzw842vv2x0441cac"; + sha256 = "10r5f1n0vcxxmqqqsgmlvibwg1xffijrr2id6r140rgiyhprz556"; }; checkInputs = [ @@ -38,6 +38,7 @@ with python3.pkgs; buildPythonApplication rec { click html5lib vcrpy + toml ]; postPatch = '' From e6307b46d8493b399e2269ab9e62bc0f1b101629 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 23 Jun 2020 15:55:13 -0400 Subject: [PATCH 530/624] discord: fix appindicator tray icon support Include libappindicator-gtk3 in discord's library path so it's able to create an indicator icon. --- .../networking/instant-messengers/discord/base.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index c2af3e4d3e7d..0ee84dae356e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -4,7 +4,7 @@ , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb -, mesa, nspr, nss, pango, systemd +, mesa, nspr, nss, pango, systemd, libappindicator-gtk3 }: let @@ -35,6 +35,7 @@ in stdenv.mkDerivation rec { gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver + libappindicator-gtk3 ]; installPhase = '' From a4d4fbc3fdbe9d8105216a0552cdc189c22480cd Mon Sep 17 00:00:00 2001 From: Daniel KT Date: Tue, 23 Jun 2020 16:30:51 -0400 Subject: [PATCH 531/624] Bump linode-cli version linode-cli version -> 2.15.0 linode api version -> 4.67.0 --- pkgs/tools/virtualization/linode-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index c16eb003d8d4..47953d21dfe0 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,21 +13,21 @@ let spec = fetchurl { - url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.63.1/openapi.yaml"; - sha256 = "03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0"; + url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.67.0/openapi.yaml"; + sha256 = "0vsblprkqlr9508x5rkm0wj6lc3w72xiwiqxia9asgr5k45hhfnr"; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "1hpdmbzs182iag471yvq3kwd1san04a58sczzbmw6vjv2kswn1c2"; + sha256 = "06iz9xjj6h1ry176558488fl9j18a5vf724zh4cxlcksdy72dnna"; }; patches = [ From 0bbeec3904a69c9afe75512bfafcf7401eb17458 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 23 Jun 2020 22:45:52 +0200 Subject: [PATCH 532/624] mutt: 1.14.4 -> 1.14.5 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index b88e70a168fa..a6acea9d1cb4 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.4"; + version = "1.14.5"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1hykkq3m7kqic5r7vzg45xaww7415fv5i2d03slzykqb47w5d3na"; + sha256 = "0p1xiqzmkqlzy5yi4l0dh0lacdq300zdj48zk0fir8j1pp512sri"; }; patches = optional smimeSupport (fetchpatch { From d60d8e6b5b8afb2f465d11620f6c2dd855eae635 Mon Sep 17 00:00:00 2001 From: Timothy Stott Date: Tue, 23 Jun 2020 22:10:22 +0100 Subject: [PATCH 533/624] aws-okta: 0.26.3 -> 1.0.2 --- pkgs/tools/security/aws-okta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index fe7d5e69f4d5..548a30db2d6a 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "aws-okta"; - version = "0.26.3"; + version = "1.0.2"; goPackagePath = "github.com/segmentio/aws-okta"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "segmentio"; repo = "aws-okta"; rev = "v${version}"; - sha256 = "0n6xm3yv0lxfapchzfrqi05hk918n4lh1hcp7gq7hybam93rld96"; + sha256 = "0rqkbhprz1j9b9bx3wvl5zi4p02q1qza905wkrvh42f9pbknajww"; }; goDeps = ./deps.nix; From fa8a324ae85c454826b8d58b31870390805c1f01 Mon Sep 17 00:00:00 2001 From: Timothy Stott Date: Tue, 23 Jun 2020 22:17:07 +0100 Subject: [PATCH 534/624] aws-okta: embed version in build --- pkgs/tools/security/aws-okta/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 548a30db2d6a..193198ccd213 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -17,6 +17,8 @@ buildGoPackage rec { buildFlags = [ "--tags" "release" ]; + buildFlagsArray = [ "-ldflags=-X main.Version=${version}" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 libiconv ]; From e07238681d9af5e667d2b6078c8a5aa11b9a6f4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Jun 2020 06:10:26 +0000 Subject: [PATCH 535/624] python37Packages.azure-mgmt-security: 0.3.0 -> 0.4.0 --- .../python-modules/azure-mgmt-security/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index 5a9d8849f8d2..ae50ee6d3ebd 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0z766424783a6y5dp5ybxssb0bfzqb8kpa6zra8ccnbfg4fn478v"; + sha256 = "1gpkvvk4prx6khs6vrlbqlg6zarsmplg3k9zbymxfm6irriqildm"; extension = "zip"; }; From dde159fd98f8f0352571a443a8cc8451c03a4c40 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 24 Jun 2020 00:17:05 +0200 Subject: [PATCH 536/624] hstr: install manpage --- pkgs/applications/misc/hstr/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index b1e740fb7607..81f931b11f8e 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -15,15 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ readline ncurses gettext ]; - configurePhase = '' - autoreconf -fvi - ./configure - ''; - - installPhase = '' - mkdir -p $out/bin/ - mv src/hstr $out/bin/ - ''; + configureFlags = [ "--prefix=$(out)" ]; meta = { homepage = "https://github.com/dvorka/hstr"; From 67e8240371062b36534f08af9ed312a6e04f5239 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 15:33:46 -0700 Subject: [PATCH 537/624] python3Packages.tempora: fix tests --- pkgs/development/python-modules/tempora/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index d1f40f349f4f..9b54953d28ce 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi , setuptools_scm, pytest, freezegun, backports_unittest-mock +, pytest-black, pytestcov, pytest-flake8 , six, pytz, jaraco_functools }: buildPythonPackage rec { @@ -11,15 +12,15 @@ buildPythonPackage rec { sha256 = "e370d822cf48f5356aab0734ea45807250f5120e291c76712a1d766b49ae34f8"; }; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six pytz jaraco_functools ]; - checkInputs = [ pytest freezegun backports_unittest-mock ]; + checkInputs = [ pytest pytest-flake8 pytest-black pytestcov freezegun backports_unittest-mock ]; + # missing pytest-freezegun package checkPhase = '' - substituteInPlace pytest.ini --replace "--flake8" "" - pytest + pytest -k 'not get_nearest_year_for_day' ''; meta = with lib; { From 3853e60ae37119ffbcab21fd5dff285c747f9c18 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 15:43:09 -0700 Subject: [PATCH 538/624] python3Packages.cheroot: fix tests, cleanup expr --- .../python-modules/cheroot/default.nix | 53 ++++++++++++++----- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 269e59b9c184..1ea6b87fa00a 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,10 +1,19 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, isPy3k -, more-itertools, six, setuptools_scm, setuptools-scm-git-archive -, pytest, pytestcov, portend, pytest-testmon, pytest-mock -, backports_unittest-mock, pyopenssl, requests, trustme, requests-unixsocket -, backports_functools_lru_cache }: - -let inherit (stdenv) lib; in +{ lib, stdenv, fetchPypi, buildPythonPackage, isPy3k +, jaraco_text +, more-itertools +, portend +, pyopenssl +, pytestCheckHook +, pytestcov +, pytest-mock +, pytest-testmon +, requests +, requests-unixsocket +, setuptools_scm +, setuptools-scm-git-archive +, six +, trustme +}: buildPythonPackage rec { pname = "cheroot"; @@ -19,21 +28,39 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; - propagatedBuildInputs = [ more-itertools six backports_functools_lru_cache ]; + propagatedBuildInputs = [ more-itertools six ]; - checkInputs = [ pytest pytestcov portend backports_unittest-mock pytest-mock pytest-testmon pyopenssl requests trustme requests-unixsocket ]; + checkInputs = [ + jaraco_text + portend + pyopenssl + pytestCheckHook + pytestcov + pytest-mock + pytest-testmon + requests + requests-unixsocket + trustme + ]; # Disable doctest plugin because times out # Disable xdist (-n arg) because it's incompatible with testmon # Deselect test_bind_addr_unix on darwin because times out # Deselect test_http_over_https_error on darwin because builtin cert fails # Disable warnings-as-errors because of deprecation warnings from socks on python 3.7 - checkPhase = '' - substituteInPlace pytest.ini --replace "--doctest-modules" "" --replace "-n auto" "" - ${lib.optionalString (pythonAtLeast "3.7") "sed -i '/warnings/,+2d' pytest.ini"} - pytest -k 'not tls' ${lib.optionalString stdenv.isDarwin "--deselect=cheroot/test/test_ssl.py::test_http_over_https_error --deselect=cheroot/test/test_server.py::test_bind_addr_unix"} + # adds many other pytest utilities which aren't necessary like linting + preCheck = '' + rm pytest.ini ''; + disabledTests= [ + "tls" # touches network + "peercreds_unix_sock" # test urls no longer allowed + ] ++ lib.optionals stdenv.isDarwin [ + "http_over_https_error" + "bind_addr_unix" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; From 12bf275bab9794bc4818f0f3a9b1f0c63318e5dc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 17:47:11 -0700 Subject: [PATCH 539/624] fava: fix tests --- pkgs/applications/office/fava/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 8e1bb0d76d92..b33d978ee0b9 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,16 +5,16 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.14"; + version = "1.15"; src = fetchPypi { inherit pname version; - sha256 = "181ypq2p7aaq2b76s55hxxbm1hykzf45mjjgm500h4dsaa167dqy"; + sha256 = "037fhimfjiqay28wg7hd5sm7r0935ynw9d905iszn965ihr1qsgz"; }; checkInputs = [ python3.pkgs.pytest ]; propagatedBuildInputs = with python3.pkgs; - [ + [ Babel cheroot flaskbabel @@ -30,8 +30,9 @@ buildPythonApplication rec { ]; # CLI test expects fava on $PATH. Not sure why static_url fails. + # the entry_slices and render_entries requires other files to pass checkPhase = '' - py.test tests -k 'not cli and not static_url' + py.test tests -k 'not cli and not static_url and not entry_slice and not render_entries' ''; meta = { From 893d924d53c2a897b25489fce5b70e0f4eb84f77 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 17:49:22 -0700 Subject: [PATCH 540/624] python3Packages.jaraco_logging: disable tests, no longer on pypi --- ...t-run-flake8-checks-during-the-build.patch | 38 ------------------- .../python-modules/jaraco_logging/default.nix | 14 +++---- 2 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch diff --git a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch deleted file mode 100644 index aab9604b9ce8..000000000000 --- a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 10 Mar 2019 16:42:21 +0100 -Subject: [PATCH] Don't run flake8 checks during the build - -If the code simply violates their code style, the Nix package shouldn't fail. ---- - pytest.ini | 2 +- - setup.cfg | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/pytest.ini b/pytest.ini -index 9b3c1ec..a5189c1 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,6 +1,6 @@ - [pytest] - norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --flake8 -+addopts=--doctest-modules - doctest_optionflags=ALLOW_UNICODE ELLIPSIS - filterwarnings= - ignore:Possible nested set::pycodestyle:113 -diff --git a/setup.cfg b/setup.cfg -index 3e7bbed..5cac7a2 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -29,7 +29,6 @@ setup_requires = setuptools_scm >= 1.15.0 - testing = - pytest >= 3.5, !=3.7.3 - pytest-checkdocs -- pytest-flake8 - docs = - sphinx - jaraco.packaging >= 3.2 --- -2.18.1 - diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index cf4ae4e435cc..3f9fa4d67caf 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, setuptools_scm -, tempora, six, pytest +, tempora, six }: buildPythonPackage rec { @@ -11,15 +11,13 @@ buildPythonPackage rec { sha256 = "31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e"; }; - patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; - - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora six ]; - checkInputs = [ pytest ]; - checkPhase = '' - PYTHONPATH=".:$PYTHONPATH" pytest - ''; + # test no longer packaged with pypi + doCheck = false; + + pythonImportsCheck = [ "jaraco.logging" ]; meta = with lib; { description = "Support for Python logging facility"; From 5889e6941e9c3a4ece08617592b77ddef8f83844 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 18:03:41 -0700 Subject: [PATCH 541/624] ceph: fix build --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2073f0098015..d21aa51ebf1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2482,7 +2482,7 @@ in libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { - boost = boost167.override { enablePython = true; python = python37; }; + boost = boost16x.override { enablePython = true; python = python38; }; }) ceph ceph-client; From b6f95732fc014e7e4aaf84257775dd70cd8bc9be Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 18:08:34 -0700 Subject: [PATCH 542/624] python3Packages.jaraco_itertools: fix tests --- ...t-run-flake8-checks-during-the-build.patch | 38 ------------------- .../jaraco_itertools/default.nix | 8 ++-- 2 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch deleted file mode 100644 index 43530fcc3285..000000000000 --- a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 10 Mar 2019 13:10:18 +0100 -Subject: [PATCH] Don't run flake8 checks during the build - -If the code simply violates their code style, the Nix package shouldn't fail. ---- - pytest.ini | 2 +- - setup.cfg | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/pytest.ini b/pytest.ini -index d165e5e..d8e4694 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,6 +1,6 @@ - [pytest] - norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --flake8 -+addopts=--doctest-modules - doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES - filterwarnings= - ignore:Possible nested set::pycodestyle:113 -diff --git a/setup.cfg b/setup.cfg -index 9f3517f..c9033ec 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0 - testing = - pytest >= 3.5, !=3.7.3 - pytest-checkdocs -- pytest-flake8 - docs = - sphinx - jaraco.packaging >= 3.2 --- -2.18.1 - diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 1932f672b014..7f1d954f68d2 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -11,16 +11,18 @@ buildPythonPackage rec { sha256 = "6447d567f57efe5efea386265c7864652e9530830a1b80f43e60b4f222b9ab84"; }; - patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; - - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; checkInputs = [ pytest ]; + # tests no longer available through pypi + doCheck = false; checkPhase = '' pytest ''; + pythonImportsCheck = [ "jaraco.itertools" ]; + meta = with lib; { description = "Tools for working with iterables"; homepage = "https://github.com/jaraco/jaraco.itertools"; From 3da3d5c9f06cef6d57806482a63a35571105c435 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 18:08:55 -0700 Subject: [PATCH 543/624] python3Packages.irc: fix meta --- pkgs/development/python-modules/irc/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 5828ada7a61d..b04ab3febdb1 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools , setuptools_scm, jaraco_collections, importlib-metadata }: @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; - buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ six importlib-metadata @@ -27,4 +27,11 @@ buildPythonPackage rec { jaraco_itertools jaraco_collections ]; + + meta = with lib; { + description = "IRC (Internet Relay Chat) protocol library for Python"; + homepage = "https://github.com/jaraco/irc"; + license = licenses.mit; + maintainers = []; + }; } From bb1dbfbf47b03d3317cab617b8079808e1701c9b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 18:20:54 -0700 Subject: [PATCH 544/624] python3Packages.flask-restful: fix tests --- .../python-modules/flask-restful/default.nix | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 17c63f326ea4..d5b48fd0428a 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -1,37 +1,27 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k -, nose, mock, blinker +, nose, mock, blinker, pytest , flask, six, pytz, aniso8601, pycrypto }: buildPythonPackage rec { pname = "Flask-RESTful"; - version = "0.3.6"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap"; + sha256 = "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay"; }; - patches = [ - (fetchpatch { - url = "https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch"; - sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5"; - }) - (fetchpatch { - url = "https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch"; - sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl"; - }) - ]; - - postPatch = lib.optionalString isPy3k '' - # TypeError: Only byte strings can be passed to C code - rm tests/test_crypto.py tests/test_paging.py - ''; - - checkInputs = [ nose mock blinker ]; - propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ]; + checkInputs = [ pytest nose mock blinker ]; + + # test_reqparse.py: werkzeug move Multidict location (only imported in tests) + # handle_non_api_error isn't updated for addition encoding argument + checkPhase = '' + pytest --ignore=tests/test_reqparse.py -k 'not handle_non_api_error' + ''; + meta = with lib; { homepage = "https://flask-restful.readthedocs.io/"; description = "REST API building blocks for Flask"; From 496edca86587add98ed8f375f486ef0ba6fc3724 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 22 Jun 2020 18:22:03 -0700 Subject: [PATCH 545/624] python2Packages.inflect: disable python2, abandoned --- pkgs/development/python-modules/inflect/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index d4e544ad8d43..b7fbe41f691f 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -1,8 +1,9 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, nose, six, importlib-metadata, toml }: +{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, nose, six, importlib-metadata, toml }: buildPythonPackage rec { pname = "inflect"; version = "4.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; From f14034fe47dddfa3a9adbb06500c3baf83adcb23 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Tue, 23 Jun 2020 17:24:21 -0400 Subject: [PATCH 546/624] python3Packages.dash-core-components: 1.10.0 -> 1.10.1 --- .../python-modules/dash-core-components/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index e88591aba9af..a0dec64906ef 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.10.0"; + version = "1.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1bqvxm7h3b0wah32jrsn919hp4xr1zlkxclbs261mvd57ps0rf9h"; + sha256 = "02115plwhvyrmal01xp2964w8psysr2kf4ink8mh9z7kmda98l68"; }; # No tests in archive From 0498309db56ffce3d12c784026eb31b8e22ddc7d Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Tue, 23 Jun 2020 17:24:44 -0400 Subject: [PATCH 547/624] python3Packages.dash-renderer: 1.4.1 -> 1.5.0 --- pkgs/development/python-modules/dash-renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index a92f6617abec..8cb9250f34dd 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "11fl7756zshlrfiqcr6rcg1m0c4434vdg1bkrcjl54hl02k3pcmv"; + sha256 = "14fp66vasfag1bss09qyjnqa000g56q7vcap3ig57xycflks4c3y"; }; # No tests in archive From 33d83f127a721243ed32c1353fb23afc57cad7b5 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Tue, 23 Jun 2020 17:25:07 -0400 Subject: [PATCH 548/624] python3Packages.dash-table: 4.7.0 -> 4.8.1 --- pkgs/development/python-modules/dash-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 9c323c6fa33f..8cdf0408deee 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.7.0"; + version = "4.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0md7qqjpsarc8ymfccvsqgj6mgq8gxl09im5v5yxhv8hv24yy4jm"; + sha256 = "16q0d9fidllxm7p51i5p4vzknnc09d114zqw3f4a2spr7llga7xj"; }; # No tests in archive From 10b552532f66d915bb22f56899cde89a28a7c9f3 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Tue, 23 Jun 2020 17:25:28 -0400 Subject: [PATCH 549/624] python3Packages.dash: 1.12.0 -> 1.13.3 --- pkgs/development/python-modules/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 4a9a9a60af87..3757ff47408a 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.12.0"; + version = "1.13.3"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "0nr5ppjbfmay0d3bah26i4k8xj6xyp24gq0cqlv9lzdrbdd3j9wy"; + sha256 = "131p725rc731ynksp12h9j1faq3vl51d5p64ln22r7zx4pvahss5"; }; propagatedBuildInputs = [ From d5b6a9c6de130f87b7d78d6051a553ec3e183388 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Sun, 3 May 2020 03:00:58 +0200 Subject: [PATCH 550/624] vim-beancount: fix broken Runtime dependency on python3 'beancount' package needed for autocompletion engine. Signed-off-by: Sirio Balmelli --- pkgs/misc/vim-plugins/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index d9a68b90041e..b2ff6c79f5aa 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -556,6 +556,10 @@ self: super: { dependencies = with super; [ vim-maktaba ]; }); + vim-beancount = super.vim-beancount.overrideAttrs(old: { + passthru.python3Dependencies = ps: with ps; [ beancount ]; + }); + vim-codefmt = super.vim-codefmt.overrideAttrs(old: { dependencies = with super; [ vim-maktaba ]; }); From 9fbbbf1a541e60ed4c362be152ba8de0087ee1e2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 23 Jun 2020 16:21:16 -0700 Subject: [PATCH 551/624] python37Packages.quandl: fix build --- pkgs/development/python-modules/quandl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 2d78b626092d..33fc54241d9a 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -1,7 +1,7 @@ { - lib, fetchPypi, buildPythonPackage, isPy3k, + lib, fetchPypi, buildPythonPackage, isPy3k, pythonOlder, # runtime dependencies - pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, + pandas, numpy, requests, inflection, python-dateutil, six, more-itertools, importlib-metadata, # test suite dependencies nose, unittest2, flake8, httpretty, mock, jsondate, parameterized, faker, factory_boy, # additional runtime dependencies are required on Python 2.x @@ -45,6 +45,8 @@ buildPythonPackage rec { pyOpenSSL ndg-httpsclient pyasn1 + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; meta = with lib; { From ffedc82d2e877c032efcdacfd92f0effcbdd9cbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Jun 2020 05:08:31 +0000 Subject: [PATCH 552/624] python27Packages.azure-mgmt-web: 0.46.0 -> 0.47.0 --- pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 48f7296d9994..727311cc09a9 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.46.0"; + version = "0.47.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e1988aa2b91e6b5aa84e48ac02d5546945bdc2d8331744869e923ba15066c4a6"; + sha256 = "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq"; }; propagatedBuildInputs = [ From 3c6bd1664833dc460afa1593f6b5350c41861492 Mon Sep 17 00:00:00 2001 From: gustavderdraache Date: Tue, 23 Jun 2020 20:42:11 -0400 Subject: [PATCH 553/624] kubernetes-helm: Restore vendorSha256 --- pkgs/applications/networking/cluster/helm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 5e51fe4267d4..2e4f68d6bfa7 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1453qkd9s4z4r0xzmv8ym7qfg33szf6gizfkb5zxj590fcbsgnd7"; }; - vendorSha256 = null; + vendorSha256 = "0j25m56cwzjd9b75v7xlb26q81bsmln77k23h9n8v2f2gqwwpkrl"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; From 4398e9e346c1f127415d3d76afae3bdfe6e4e300 Mon Sep 17 00:00:00 2001 From: Thomas Friese Date: Wed, 24 Jun 2020 04:28:20 +0200 Subject: [PATCH 554/624] bitwig-studio3: 3.1.3 -> 3.2.2 (#90461) * bitwig-studio3: 3.1.3 -> 3.2.1 * bitwig-studio3: 3.1.3 -> 3.2.2 * Update pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix Co-authored-by: Philipp Mildenberger * Update pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix Co-authored-by: Philipp Mildenberger Co-authored-by: Philipp Mildenberger --- pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 59136596b0e1..0ca556a16ef9 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,11 +2,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.1.3"; + version = "3.2.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "11z5flmp55ywgxyccj3pzhijhaggi42i2pvacg88kcpj0cin57vl"; + sha256 = "10zb78n75nbriyjah0m3syv3rv7qwbmj590z24hss7lifa3rs784"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; From 27108e7cee4fc4d8d8ab6e8915590c17f39692d3 Mon Sep 17 00:00:00 2001 From: Hugo Reeves Date: Wed, 24 Jun 2020 14:39:16 +1200 Subject: [PATCH 555/624] cargo-tarpaulin: 0.13.3 -> 0.13.4 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 037645490952..d564067cfc2d 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = "${version}"; - sha256 = "1zc03frbag0lhxxbrdhip5h61ah16rqfcs314nyx7lfn3jd0gqzd"; + sha256 = "094gkxdlydaqzmdy6a6az09yph102nd1fzwz6b12hg3vb50fxv7r"; }; nativeBuildInputs = [ @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - cargoSha256 = "15qf5hb6gm4lm1dcsqqs8nmd43m1qmw2g2zpj3c0abs5fbdz8k3a"; + cargoSha256 = "0glcc4qmvz25p1zxx1igd37l2pb10i80kj5smafkgbczgn01iwk9"; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; From 46f11f53c9ef18b79bf81494a9325a4be85d07ad Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 24 Jun 2020 13:53:28 +0900 Subject: [PATCH 556/624] chromium: 83.0.4103.106 -> 83.0.4103.116 https://chromereleases.googleblog.com/2020/06/stable-channel-update-for-desktop_22.html This update includes 2 security fixes. CVEs: CVE-2020-6509 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 65dda4931422..376d155d6f97 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0wsqxq8xxcafmjxsjkagysrcbr6qryiyqn6m3ysp256aam7z3d88"; - sha256bin64 = "03jff1sdv05hbn37cw0ij0r4rils0q11lnnhxg52igg633jzwyc1"; - version = "84.0.4147.45"; + sha256 = "1s49qxg0gfmhm1lf5big6hprral21dbzjx0f1cp3xfvag9y61i7h"; + sha256bin64 = "1sjvi3qmpwpr51442324a853k6s0k59k4809k8j5sjv7h6arw0sm"; + version = "84.0.4147.56"; }; dev = { - sha256 = "16rmzyzjmxmhmr5yqbzqbwf5sq94iqcwlm04fkafiwcycd17nyhs"; - sha256bin64 = "0wjmc1wdmwiq9d1f5gk4c9jkj1p116kaz9nb0hvhjf01iv07xl2m"; - version = "85.0.4168.2"; + sha256 = "1gxa0jg7xff87z7wvllp84a3ii1ypgy4vfzgxs4k7kzg5x0412vi"; + sha256bin64 = "0swmn37rmvjvvdcrd002qg1wcvna06y14s3kx34bfr4zxhqk3lby"; + version = "85.0.4173.0"; }; stable = { - sha256 = "0bvy17ymlih87n4ymnzvyn0m34ghmr1yasvy7gxv02qbw6i57lfg"; - sha256bin64 = "00hjr5y0cczs6h2pxrigpmjiv24456948v32q7mr7x5ysr5kxpn6"; - version = "83.0.4103.106"; + sha256 = "1hravbi1lazmab2mih465alfzji1kzy38zya1visbwz9zs6pw35v"; + sha256bin64 = "1ggyv2b50sclnqph0r40lb8p9h3pq9aq4fj1wdszhwc4rb0cj746"; + version = "83.0.4103.116"; }; } From 97c886e2c727f1464eae5425e7bbe3b3b84ca4c5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 17 Jun 2020 07:26:25 +0200 Subject: [PATCH 557/624] ocamlPackages.lwt2: remove at 2.7.1 --- pkgs/development/ocaml-modules/lwt/legacy.nix | 58 ------------------- pkgs/top-level/ocaml-packages.nix | 4 +- 2 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/lwt/legacy.nix diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix deleted file mode 100644 index 795baa0467e2..000000000000 --- a/pkgs/development/ocaml-modules/lwt/legacy.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, react, ssl, libev, pkgconfig, ncurses, glib -, ppx_tools, result, cppo -, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" -, version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" -}: - -if !stdenv.lib.versionAtLeast ocaml.version "4" - || stdenv.lib.versionAtLeast ocaml.version "4.06" -then throw "lwt is not available for OCaml ${ocaml.version}" -else - -let sha256 = { - "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88"; - "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; - "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; -}.${version}; in - -let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in - -buildOcaml { - name = "lwt"; - inherit version; - - src = fetchzip { - url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ] - ++ stdenv.lib.optional ppxSupport ppx_tools; - - propagatedBuildInputs = [ result ] - ++ optionals [ react ssl ] - ++ [ libev ]; - - configureScript = "ocaml setup.ml -configure"; - prefixKey = "--prefix "; - configureFlags = - optionals [ "--enable-glib" "--enable-ssl" "--enable-react" ] - ++ [ "--enable-camlp4" ] - ++ [ (if ppxSupport then "--enable-ppx" else "--disable-ppx") ]; - - createFindlibDestdir = true; - - hasSharedObjects = true; - - meta = with stdenv.lib; { - homepage = "http://ocsigen.org/lwt"; - description = "Lightweight thread library for Objective Caml"; - license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ - maggesi vbgl gal_bolle - ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d5d7a81a0875..644da2d2409e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -467,11 +467,9 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; - lwt2 = callPackage ../development/ocaml-modules/lwt/legacy.nix { }; - lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { }; - ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt4 else lwt2; + ocaml_lwt = lwt4; lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; From 490c75f1ca557e7255dd4ea12c17847d3d3cca84 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 17 Jun 2020 07:26:31 +0200 Subject: [PATCH 558/624] =?UTF-8?q?ocamlPackages.lwt:=20rename=20file=20to?= =?UTF-8?q?=20=E2=80=9Cdefault.nix=E2=80=9D=20and=20attribute=20to=20?= =?UTF-8?q?=E2=80=9Clwt=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lwt/{4.x.nix => default.nix} | 0 pkgs/top-level/ocaml-packages.nix | 36 ++++++------------- 2 files changed, 11 insertions(+), 25 deletions(-) rename pkgs/development/ocaml-modules/lwt/{4.x.nix => default.nix} (100%) diff --git a/pkgs/development/ocaml-modules/lwt/4.x.nix b/pkgs/development/ocaml-modules/lwt/default.nix similarity index 100% rename from pkgs/development/ocaml-modules/lwt/4.x.nix rename to pkgs/development/ocaml-modules/lwt/default.nix diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 644da2d2409e..1ff7c8a51989 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -170,11 +170,9 @@ let cstruct = if lib.versionAtLeast ocaml.version "4.2" then callPackage ../development/ocaml-modules/cstruct {} - else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { lwt = ocaml_lwt; }; + else callPackage ../development/ocaml-modules/cstruct/1.9.0.nix { }; - cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { - lwt = ocaml_lwt; - }; + cstruct-lwt = callPackage ../development/ocaml-modules/cstruct/lwt.nix { }; cstruct-sexp = callPackage ../development/ocaml-modules/cstruct/sexp.nix {}; @@ -459,35 +457,25 @@ let llvm = pkgs.llvm_8; }; - logs = callPackage ../development/ocaml-modules/logs { - lwt = ocaml_lwt; - }; + logs = callPackage ../development/ocaml-modules/logs { }; lru = callPackage ../development/ocaml-modules/lru { }; lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; - lwt4 = callPackage ../development/ocaml-modules/lwt/4.x.nix { }; + lwt = callPackage ../development/ocaml-modules/lwt { }; - ocaml_lwt = lwt4; + ocaml_lwt = lwt; lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; - lwt_log = callPackage ../development/ocaml-modules/lwt_log { - lwt = lwt4; - }; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; - lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { - lwt = ocaml_lwt; - }; + lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { }; - lwt_react = callPackage ../development/ocaml-modules/lwt_react { - lwt = ocaml_lwt; - }; + lwt_react = callPackage ../development/ocaml-modules/lwt_react { }; - lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { - lwt = ocaml_lwt; - }; + lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { }; macaddr = callPackage ../development/ocaml-modules/macaddr { }; @@ -497,7 +485,7 @@ let magick = callPackage ../development/ocaml-modules/magick { }; - markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; + markup = callPackage ../development/ocaml-modules/markup { }; mdx = callPackage ../development/ocaml-modules/mdx { }; @@ -567,9 +555,7 @@ let nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; - notty = callPackage ../development/ocaml-modules/notty { - lwt = ocaml_lwt; - }; + notty = callPackage ../development/ocaml-modules/notty { }; npy = callPackage ../development/ocaml-modules/npy { inherit (pkgs.python3Packages) numpy; From 06c483e82e2f5f829c4e12455118ec64b5fbfc2d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Jun 2020 00:45:27 +0200 Subject: [PATCH 559/624] =?UTF-8?q?ocamlPackages.dns(-client):=204.6.0=20?= =?UTF-8?q?=E2=86=92=204.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index 68a8ad8da4ed..6075f4e7fb6d 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "dns"; - version = "4.6.0"; + version = "4.6.1"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "1gkswpc91j4ps60bp52ggg4qwj5g88f49x6p6d619p4x8vmhjylv"; + sha256 = "0nsx98r2i1siz0yghnh87f2sq8w79if7ih9259yay1bp39crd6gd"; }; propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ]; From 4a0b13b8a01791c91cfde6aa6729eed5fab45428 Mon Sep 17 00:00:00 2001 From: betaboon Date: Fri, 22 May 2020 12:38:32 +0200 Subject: [PATCH 560/624] xdg-desktop-portal: 1.6.0 -> 1.7.2 --- .../libraries/xdg-desktop-portal/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 02c039b8eaba..b06edc632730 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -6,7 +6,7 @@ , pkgconfig , libxml2 , glib -, pipewire_0_2 +, pipewire , fontconfig , flatpak , gsettings-desktop-schemas @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.6.0"; + version = "1.7.2"; outputs = [ "out" "installedTests" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "0fbsfpilwbv7j6cimsmmz6g0r96bw0ziwyk9z4zg2rd1mfkmmp9a"; + sha256 = "0rkwpsmbn3d3spkzc2zsd50l2r8pp4la390zcpsawaav8w7ql7xm"; }; patches = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - pipewire_0_2 + pipewire fontconfig flatpak acl @@ -61,10 +61,6 @@ stdenv.mkDerivation rec { json-glib ]; - # Seems to get stuck after "PASS: test-portals 39 /portal/inhibit/monitor" - # TODO: investigate! - doCheck = false; - configureFlags = [ "--enable-installed-tests" ]; From 3521a4760fe6c25458bbc66ba434ac197fe33fb8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 24 Jun 2020 09:27:55 +0200 Subject: [PATCH 561/624] xdg-desktop-portal-gtk: 1.6.0 -> 1.7.1 --- pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 994c2864e7f1..14cfeefe4289 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1gpbjkfkrpk96krc1zbccrq7sih282mg303ifxaaxbnj6d8drm5h"; + sha256 = "183iha9dxmvprn99ymgz17jx1lyn1fj5jyj6ghxl716zn9mxmird"; }; nativeBuildInputs = [ From 4ab300d6e2b741c331b43b5a444e3cab34f72255 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 24 Jun 2020 16:16:01 +0800 Subject: [PATCH 562/624] just: 0.5.11 -> 0.6.0 --- pkgs/development/tools/just/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 1f11cac7bde2..42ee4041f205 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash -, installShellFiles }: +{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.5.11"; + version = "0.6.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0li5lspxfrim8gymqzzd5djjfbfi7jh1m234qlzy5vkx2q9qg0xv"; + sha256 = "1sl235wr4fdsw0f0x7jynv6ljhvgis4d87xzpvjzajhdaappdp8d"; }; - cargoSha256 = "1sp8xrh3gmgmphh1bv050p1ybjybk9x8kswyxz2rd93q3zb5hpzz"; + cargoSha256 = "0k3aqwvdm95403s279gkksklnikgyjpf5qvngsvsrm5xqda438jk"; nativeBuildInputs = [ installShellFiles ]; From c281c84a1e19108f3ae4e06e6d99d254f7c9b5d8 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Sat, 20 Jun 2020 13:59:31 +0300 Subject: [PATCH 563/624] mp4v2: 2.0.0 -> 4.1.3 Switch into maintanable fork. It is the community central fork. Remove old patch, use new minor upstream patch to compile. I weighted-in on the patch reasoning to be merged. Strictify hardening. Documentation update M pkgs/development/libraries/mp4v2/default.nix --- pkgs/development/libraries/mp4v2/default.nix | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 8fe1477aa63d..9601ae1eea30 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -1,39 +1,39 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchFromGitHub, fetchurl }: stdenv.mkDerivation rec { - name = "mp4v2-2.0.0"; + pname = "mp4v2"; + version = "4.1.3"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/${name}.tar.bz2"; - sha256 = "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683"; + src = fetchFromGitHub { + # 2020-06-20: THE current upstream, maintained and used in distros fork. + owner = "TechSmith"; + repo = "mp4v2"; + rev = "Release-ThirdParty-MP4v2-${version}"; + sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv"; }; patches = [ (fetchurl { - name = "gcc-7.patch"; - url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/" - + "0004-Fix-GCC7-build.patch?id=d7aeedabb"; + # 2020-06-19: NOTE: # Fix build with C++11 + # Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed. + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713"; sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; }) ]; - buildFlags = [ "CXXFLAGS=-std=c++03" ]; - # `faac' expects `mp4.h'. postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h"; - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; meta = { - description = "Abandoned library. Provides functions to read, create, and modify mp4 files"; + description = "Provides functions to read, create, and modify mp4 files"; longDescription = '' MP4v2 library provides an API to work with mp4 files as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This container format is derived from Apple's QuickTime format. ''; - homepage = "https://code.google.com/archive/p/mp4v2/"; + homepage = "https://github.com/TechSmith/mp4v2"; maintainers = [ lib.maintainers.Anton-Latukha ]; platforms = lib.platforms.unix; license = lib.licenses.mpl11; From 52bdd452c778a1652f0b734ca03c581831a1af8f Mon Sep 17 00:00:00 2001 From: Timothy Stott Date: Wed, 24 Jun 2020 11:32:45 +0100 Subject: [PATCH 564/624] aws-okta: remove obselete goDeps dependencies All dependencies are vendored in the repository. --- pkgs/tools/security/aws-okta/default.nix | 2 -- pkgs/tools/security/aws-okta/deps.nix | 29 ------------------------ 2 files changed, 31 deletions(-) delete mode 100644 pkgs/tools/security/aws-okta/deps.nix diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 193198ccd213..909c822374f4 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -13,8 +13,6 @@ buildGoPackage rec { sha256 = "0rqkbhprz1j9b9bx3wvl5zi4p02q1qza905wkrvh42f9pbknajww"; }; - goDeps = ./deps.nix; - buildFlags = [ "--tags" "release" ]; buildFlagsArray = [ "-ldflags=-X main.Version=${version}" ]; diff --git a/pkgs/tools/security/aws-okta/deps.nix b/pkgs/tools/security/aws-okta/deps.nix deleted file mode 100644 index 180aa69d56c5..000000000000 --- a/pkgs/tools/security/aws-okta/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus.git"; - rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f"; - sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj"; - }; - } - { - goPackagePath = "golang.org/x/sys/unix"; - fetch = { - type = "git"; - url = "https://github.com/golang/sys.git"; - rev = "b699b7032584f0953262cb2788a0ca19bb494703"; - sha256 = "172sw1bm581qwal9pbf9qj1sgivr74nabbj8qq4q4fhgpzams9ix"; - }; - } - { - goPackagePath = "github.com/marshallbrekka/go-u2fhost"; - fetch = { - type = "git"; - url = "https://github.com/marshallbrekka/go-u2fhost"; - rev = "72b0e7a3f583583996b3b382d2dfaa81fdc4b82c"; - sha256 = "0apzmf0bjpr58ynw55agyjsl74zyg5qjk19nyyy4zhip3s9b1d0h"; - }; - } -] From 1ddbd8ce8a6cde8c6c72fc305fed1f6dd4e0d24c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 24 Jun 2020 08:25:10 -0400 Subject: [PATCH 565/624] oh-my-zsh: 2020-06-19 -> 2020-06-23 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 84e3f2a7bffa..e04aac622940 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-06-19"; + version = "2020-06-23"; pname = "oh-my-zsh"; - rev = "b706a919172955e16a1ab97f36a95b9ee4d9f1dc"; + rev = "cea89f54391c810198a7ace05f1063dd7e596bb7"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "01mf36ndzh657x8kx0fpq66zq7zf6bpiv2pg5zs7z0lglkm0x9xx"; + sha256 = "091ws4q8rgd9gzim9x8v7rgx99lw1d8kym4r1r2jy7fdxfxh6z5k"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From f3241e1b43793de5a41bf9090ec9bc5c41212bdf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 24 Jun 2020 08:25:26 -0400 Subject: [PATCH 566/624] vivaldi: 3.0.1874.38-1 -> 3.1.1929.45-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 248980e5b2b1..0ec400ea4694 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.0.1874.38-1"; + version = "3.1.1929.45-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "03667f8rlk8shxq6ghjg4q9hqhsaw4gwpqnjpyili49qczd5423w"; + sha256 = "0pg16zs9fcr6b360igszpkia3i8i5xf4m0hs1b2a17lf8vkldix9"; }; unpackPhase = '' From 0757cd4dbd174392156a0ac0e0753c0e356b8392 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 23 Jun 2020 16:20:29 -0300 Subject: [PATCH 567/624] ytree: init at 2.02 ytree is a simple file manager, inspired in the venerable DOS xtree command. --- pkgs/tools/misc/ytree/default.nix | 49 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/misc/ytree/default.nix diff --git a/pkgs/tools/misc/ytree/default.nix b/pkgs/tools/misc/ytree/default.nix new file mode 100644 index 000000000000..0400e59d22ff --- /dev/null +++ b/pkgs/tools/misc/ytree/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, fetchurl +, ncurses +, readline +}: + +stdenv.mkDerivation rec { + pname = "ytree"; + version = "2.02"; + + src = fetchurl { + url = "https://han.de/~werner/${pname}-${version}.tar.gz"; + sha256 = "1v70l244rc22f20gac1zha1smrhqkag45jn0iwgcyngfdfml3gz5"; + }; + + buildInputs = [ + ncurses readline + ]; + + # don't save timestamp, in order to improve reproducibility + postPatch = '' + substituteInPlace Makefile --replace 'gzip' 'gzip -n' + ''; + + preBuild = '' + makeFlagsArray+=(CC="cc" + ADD_CFLAGS="" + COLOR="-DCOLOR_SUPPORT" + CLOCK="-DCLOCK_SUPPORT" + READLINE="-DREADLINE_SUPPORT" + CFLAGS="-D_GNU_SOURCE -DWITH_UTF8 $(ADD_CFLAGS) $(COLOR) $(CLOCK) $(READLINE)" + LDFLAGS="-lncursesw -lreadline") + ''; + + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "A curses-based file manager similar to DOS Xtree(TM)"; + homepage = "https://www.han.de/~werner/ytree.html"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} +# TODO: X11 support diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d380d480e3a..865c2c80b4f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7847,6 +7847,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + ytree = callPackage ../tools/misc/ytree { }; + yggdrasil = callPackage ../tools/networking/yggdrasil { }; # To expose more packages for Yi, override the extraPackages arg. From 324c353ee3dff7f0d6050bc0043bad5cf74b20b3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 23 Jun 2020 12:50:03 +0200 Subject: [PATCH 568/624] =?UTF-8?q?ocamlPackages.mirage-runtime:=203.7.7?= =?UTF-8?q?=20=E2=86=92=203.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mirage/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index c7d7cf35e2d8..ea346479a0cd 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,13 +3,13 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.7.7"; + version = "3.8.0"; minimumOCamlVersion = "4.06"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "1ds5zfwb0g340kbdlsjayyw4n25nj7skdl1mwyvpzmkv4qcsmdiv"; + sha256 = "18v37arzy7gkz5qcy34k0l8g69146nysjv0h1jcym0h4xxy0bxir"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; From 8888433072bb5f822e8bd96c4724cb51909e2889 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 24 Jun 2020 14:41:45 +0200 Subject: [PATCH 569/624] dbeaver: 7.1.0 -> 7.1.1 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 3b55a1506370..6d4b4f77d2e4 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.1.0"; + version = "7.1.1"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1q3f5bghm3jw5c7c62ivf32fldjqhmj1a0qlwgqjxyhmfcig0rnb"; + sha256 = "11c9jvpjg72xkwnni4clwg3inig77s7jz3ik52gk52m6f09brxhs"; }; installPhase = '' From 388038ff98b7b2c5ae305b646a0650ce00eadf6a Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Wed, 24 Jun 2020 17:02:23 +0200 Subject: [PATCH 570/624] bazel-buildtools: 3.2.1 -> 3.3.0 --- .../tools/build-managers/bazel/buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 2f026c9d99c0..83182983455d 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "bazel-buildtools"; - version = "3.2.1"; + version = "3.3.0"; goPackagePath = "github.com/bazelbuild/buildtools"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "1f2shjskcmn3xpgvb9skli5xaf942wgyg5ps7r905n1zc0gm8izn"; + sha256 = "0g411gjbm02qd5b50iy6kk81kx2n5zw5x1m6i6g7nrmh38p3pn9k"; }; goDeps = ./deps.nix; From 34f19eacb3a3923e26f6e776e8f27dc9876239b0 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 24 Jun 2020 11:11:24 -0400 Subject: [PATCH 571/624] nvidia_x11.legacy_340: 340.107 -> 340.108 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e195bf587eed..2ad47dbde91d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -42,11 +42,11 @@ rec { }; legacy_340 = generic { - version = "340.107"; - sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd"; - sha256_64bit = "0pv9yv3x0kg9hfkmc50xb54ahxkbnyy2vyy4hj2h0s6m9sb5kqz3"; - settingsSha256 = "1zf0fy9jj6ipm5vk153swpixqm75iricmx7x49pmr97kzyczaxa7"; - persistencedSha256 = "0v225jkiqk9rma6whxs1a4fyr4haa75bvi52ss3vsyn62zzl24na"; + version = "340.108"; + sha256_32bit = "1jkwa1phf0x4sgw8pvr9d6krmmr3wkgwyygrxhdazwyr2bbalci0"; + sha256_64bit = "06xp6c0sa7v1b82gf0pq0i5p0vdhmm3v964v0ypw36y0nzqx8wf6"; + settingsSha256 = "0zm29jcf0mp1nykcravnzb5isypm8l8mg2gpsvwxipb7nk1ivy34"; + persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn"; useGLVND = false; patches = [ ./vm_operations_struct-fault.patch ]; From 9b6a64a317a4caee7fd82efd187830f589d44854 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Jun 2020 18:55:48 +0200 Subject: [PATCH 572/624] python.pkgs.line_profiler: fix build --- .../python-modules/line_profiler/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 8ff0f391f208..4275732881cd 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -6,6 +6,7 @@ , ipython , python , scikit-build +, cmake }: buildPythonPackage rec { @@ -17,9 +18,17 @@ buildPythonPackage rec { sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141"; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + cmake + scikit-build + ]; - propagatedBuildInputs = [ ipython scikit-build ]; + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ + ipython + ]; disabled = isPyPy; @@ -27,8 +36,12 @@ buildPythonPackage rec { rm -f _line_profiler.c ''; + checkInputs = [ + ipython + ]; + checkPhase = '' - ${python.interpreter} -m unittest discover -s tests + PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH cd tests && ${python.interpreter} -m unittest discover -s . ''; meta = { @@ -36,6 +49,5 @@ buildPythonPackage rec { homepage = "https://github.com/rkern/line_profiler"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; - broken = true; }; } From 0eaec4dee272d9dc67cee9599a41fcac1039845a Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 16 Jun 2020 19:25:07 +0200 Subject: [PATCH 573/624] gns3-gui: Add the missing qt5Full runtime dependency qt5Full may not be installed on users' systems and the gns3-gui depends on it explicitly. Note: This also fixes e.g. "nix-shell -p gns3-gui --pure" (at the cost of an increased closure size). --- pkgs/applications/networking/gns3/gui.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 7a0861ee3c19..bc5f78d104f3 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -1,9 +1,8 @@ { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, stdenv, python3, pkgs, fetchFromGitHub }: let - # TODO: This package requires qt5Full to launch defaultOverrides = commonOverrides ++ [ (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") @@ -27,6 +26,7 @@ in python.pkgs.buildPythonPackage rec { raven psutil jsonschema # tox for check # Runtime dependencies sip (pyqt5.override { withWebSockets = true; }) distro setuptools + pkgs.qt5Full ]; doCheck = false; # Failing From a0c0a009c37fd5b3c2dadb297925044284e4a863 Mon Sep 17 00:00:00 2001 From: Wael Nasreddine Date: Wed, 24 Jun 2020 11:08:34 -0700 Subject: [PATCH 574/624] tuijam: init at unstable 2020-06-05 (#90622) --- pkgs/applications/audio/tuijam/default.nix | 46 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/audio/tuijam/default.nix diff --git a/pkgs/applications/audio/tuijam/default.nix b/pkgs/applications/audio/tuijam/default.nix new file mode 100644 index 000000000000..8a08b64508d7 --- /dev/null +++ b/pkgs/applications/audio/tuijam/default.nix @@ -0,0 +1,46 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, python3Packages +, youtube-dl +}: + +buildPythonApplication rec { + pname = "tuijam"; + version = "unstable-2020-06-05"; + + src = fetchFromGitHub { + owner = "cfangmeier"; + repo = pname; + rev = "7baec6f6e80ee90da0d0363b430dd7d5695ff03b"; + sha256 = "1l0s88jvj99jkxnczw5nfj78m8vihh29g815n4mg9jblad23mgx5"; + }; + + buildInputs = [ python3Packages.Babel ]; + + # the package has no tests + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + gmusicapi + google_api_python_client + mpv + pydbus + pygobject3 + pyyaml + requests + rsa + urwid + ]; + + meta = with lib; { + description = "A fancy TUI client for Google Play Music"; + longDescription = '' + TUIJam seeks to make a simple, attractive, terminal-based interface to + listening to music for Google Play Music All-Access subscribers. + ''; + homepage = "https://github.com/cfangmeier/tuijam"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 413bc6de3488..4d88c63bcfb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -564,6 +564,8 @@ in adlplug = callPackage ../applications/audio/adlplug { }; + tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; }; + opnplug = callPackage ../applications/audio/adlplug { adlplugChip = "-DADLplug_CHIP=OPN2"; pname = "OPNplug"; From 10b11fe5c819d92382ba06e095740da87dc60dd7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 24 Jun 2020 19:15:34 +0200 Subject: [PATCH 575/624] tdesktop: 2.1.12 -> 2.1.13 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index eacd5ece8b88..5f5e0f9e9bfe 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.12"; + version = "2.1.13"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1b9kgib9dxjcfnw2zdbqd12ikcswkl35nwy9m47x5jvy3glxg6m8"; + sha256 = "0mq3f7faxn1hfkhv5n37y5iajjnm38s2in631046m0q7c4w3lrfi"; }; postPatch = '' From b53777c840a79580e9da73b215bac5327622bf86 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 18 Jun 2020 07:42:12 +0200 Subject: [PATCH 576/624] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F11.ocaml:?= =?UTF-8?q?=204.11.0+=CE=B12=20=E2=86=92=204.11.0+=CE=B13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index 2702a19d3187..388ee4dba8b5 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "0+alpha2"; - sha256 = "131ixp5kkgk9y42vrprhc2x0gpxhkapmdmb26pwkyl58vrbr8xqg"; + patch_version = "0+alpha3"; + sha256 = "0c2g8ncq15nx9pdl14hnsc9342j80s7i1bsyiw98cvgic5miyw9b"; } From 4bdb77918bd5449c60126b668dd691477f0cdfa4 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 24 Jun 2020 22:34:46 +0200 Subject: [PATCH 577/624] uvloop: fix tests on python 3.8 --- pkgs/development/python-modules/uvloop/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 567846b0aefd..424f4d08fe0d 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { "--tb=native" # ignore code linting tests "--ignore=tests/test_sourcecode.py" + # Fails on Python 3.8 + # https://salsa.debian.org/python-team/modules/uvloop/-/commit/302a7e8f5a2869e13d0550cd37e7a8f480e79869 + "--ignore=tests/test_tcp.py" ]; disabledTests = [ From 8bdbb204d4112532be180d3a3662da1e1acd7c1c Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 24 Jun 2020 14:58:19 +0200 Subject: [PATCH 578/624] maintainers: add siriobalmelli Signed-off-by: Sirio Balmelli --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 46ed766e0cf7..bdc2a1a83bd5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7266,6 +7266,16 @@ githubId = 2770647; name = "Simon Vandel Sillesen"; }; + siriobalmelli = { + email = "sirio@b-ad.ch"; + github = "siriobalmelli"; + githubId = 23038812; + name = "Sirio Balmelli"; + keys = [{ + longkeyid = "ed25519/0xF72C4A887F9A24CA"; + fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; + }]; + }; sivteck = { email = "sivaram1992@gmail.com"; github = "sivteck"; From d3d039c4cb605922a92833c211be8fae7af3a5b0 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Wed, 24 Jun 2020 15:06:50 +0200 Subject: [PATCH 579/624] beancount_docverif: init at 1.0.0 Signed-off-by: Sirio Balmelli Co-Authored-By: Jon --- .../beancount_docverif/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/beancount_docverif/default.nix diff --git a/pkgs/development/python-modules/beancount_docverif/default.nix b/pkgs/development/python-modules/beancount_docverif/default.nix new file mode 100644 index 000000000000..0067716b6265 --- /dev/null +++ b/pkgs/development/python-modules/beancount_docverif/default.nix @@ -0,0 +1,46 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k +, beancount +, pytest, sh +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "beancount_docverif"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1kjc0axrxpvm828lqq5m2ikq0ls8xksbmm7312zw867gdx56x5aj"; + }; + + propagatedBuildInputs = [ + beancount + ]; + + checkInputs = [ + pytest + sh + ]; + + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = "https://github.com/siriobalmelli/beancount_docverif"; + description = "Document verification plugin for Beancount"; + longDescription = '' + Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions: + + - Require that every transaction touching an account have an accompanying document on disk. + - Explictly declare the name of a document accompanying a transaction. + - Explicitly declare that a transaction is expected not to have an accompanying document. + - Look for an "implicit" PDF document matching transaction data. + - Associate (and require) a document with any type of entry, including open entries themselves. + - Guarantee integrity: verify that every document declared does in fact exist on disk. + ''; + license = licenses.mit; + maintainers = with maintainers; [ siriobalmelli ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a7d87a9ae34..e2b9f54ba357 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -517,6 +517,8 @@ in { beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + bitarray = callPackage ../development/python-modules/bitarray { }; bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; From a8f7edd5ee453ea6ea146feea34a28217b8c91fe Mon Sep 17 00:00:00 2001 From: Philipp Date: Wed, 24 Jun 2020 19:33:46 +0200 Subject: [PATCH 580/624] gomuks: 0.1.0 -> 0.1.2 --- .../networking/instant-messengers/gomuks/default.nix | 7 +++---- .../networking/instant-messengers/gomuks/gomod.patch | 12 ------------ 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/gomuks/gomod.patch diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index f7fad7f4c45a..c2402f989333 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -2,19 +2,18 @@ buildGoModule rec { pname = "gomuks"; - version = "0.1.0"; + version = "0.1.2"; goPackagePath = "maunium.net/go/gomuks"; - patches = [ ./gomod.patch ]; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v" + version; - sha256 = "1dcqkyxiqiyivzn85fwkjy8xs9yk89810x9mvkaiz0dx3ha57zhi"; + sha256 = "11bainw4w9fdrhv2jm0j9fw0f7r4cxlblyazbhckgr4j9q900383"; }; - vendorSha256 = "1mfi167mycnnlq8dwh1kkx6drhhi4ib58aad5fwc90ckdaq1rpb7"; + vendorSha256 = "11rk7pma6dr6fsyz8hpjyr7nc2c7ichh5m7ds07m89gzk6ar55gb"; buildInputs = [ olm ]; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch b/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch deleted file mode 100644 index 7b5ae45d614a..000000000000 --- a/pkgs/applications/networking/instant-messengers/gomuks/gomod.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/go.mod b/go.mod -index a07e991..ba5ae99 100644 ---- a/go.mod -+++ b/go.mod -@@ -9,6 +9,7 @@ require ( - github.com/lithammer/fuzzysearch v1.1.0 - github.com/lucasb-eyer/go-colorful v1.0.3 - github.com/mattn/go-runewidth v0.0.9 -+ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d - github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect - github.com/pkg/errors v0.9.1 - github.com/rivo/uniseg v0.1.0 From 0cff75edf9707a190ddae5d651a6b1559404ca92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ga=C5=82kowski?= Date: Wed, 24 Jun 2020 23:06:58 +0200 Subject: [PATCH 581/624] unityhub: fix editor crashes after opening a project (#91443) --- pkgs/development/tools/unityhub/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index bb84584e836e..7e62aaf4088d 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -11,7 +11,10 @@ in appimageTools.wrapType2 rec { libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5 libX11 libXcursor libXdamage libXfixes libXrender libXi - libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]); + libXcomposite libXext libXrandr libXtst libSM libICE libxcb + + libselinux pciutils libpulseaudio + ]); profile = '' export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS From 58a35beb35c6ddd0311caf753b2e7d6b05efa2f9 Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Wed, 10 Jun 2020 16:11:06 -0400 Subject: [PATCH 582/624] pythonPackages.srvlookup: init at 2.0.0 --- .../python-modules/srvlookup/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/srvlookup/default.nix diff --git a/pkgs/development/python-modules/srvlookup/default.nix b/pkgs/development/python-modules/srvlookup/default.nix new file mode 100644 index 000000000000..6cbdc81ef86d --- /dev/null +++ b/pkgs/development/python-modules/srvlookup/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage +, dnspython +, mock, nose +}: + +buildPythonPackage rec { + pname = "srvlookup"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zf1v04zd5phabyqh0nhplr5a8vxskzfrzdh4akljnz1yk2n2a0b"; + }; + + propagatedBuildInputs = [ dnspython ]; + checkInputs = [ mock nose ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/gmr/srvlookup"; + license = [ licenses.bsd3 ]; + description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples."; + maintainers = [ maintainers.mmlb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e2b9f54ba357..f2edef637a62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1556,6 +1556,8 @@ in { spglib = callPackage ../development/python-modules/spglib { }; + srvlookup = callPackage ../development/python-modules/srvlookup { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; sshtunnel = callPackage ../development/python-modules/sshtunnel { }; From b8e9a8c2df10ece2eceea22fe66d94336d2d7376 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 23 Jun 2020 06:23:45 +0000 Subject: [PATCH 583/624] postman: 7.24.0 -> 7.26.0 --- pkgs/development/web/postman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index e56ab1bbba79..f6bef241de46 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "7.24.0"; + version = "7.26.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "0wriyj58icgljmghghyxi1mnjr1vh5jyp8lzwcf6lcsdvsh0ccmw"; + sha256 = "05xs389bf0127n8rdivbfxvgjvlrk9pyr74klswwlksxciv74i3j"; name = "${pname}.tar.gz"; }; From 2b11dcd789f60961473830b7202f9b44810a455c Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 25 Apr 2020 12:58:52 +0200 Subject: [PATCH 584/624] pythonPackages.pycoin: init at 0.90.20200322 --- .../python-modules/pycoin/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pycoin/default.nix diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix new file mode 100644 index 000000000000..a0b743bb8b57 --- /dev/null +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, gnupg +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pycoin"; + version = "0.90.20200322"; + + src = fetchPypi { + inherit pname version; + sha256 = "c8af579e86c118deb64d39e0d844d53a065cdd8227ddd632112e5667370b53a3"; + }; + + propagatedBuildInputs = [ setuptools ]; + + postPatch = '' + substituteInPlace ./pycoin/cmds/tx.py --replace '"gpg"' '"${gnupg}/bin/gpg"' + ''; + + checkInputs = [ pytestCheckHook ]; + + dontUseSetuptoolsCheck = true; + + # Disable tests depending on online services + disabledTests = [ + "ServicesTest" + "test_tx_pay_to_opcode_list_txt" + "test_tx_fetch_unspent" + "test_tx_with_gpg" + ]; + + meta = with stdenv.lib; { + description = "Utilities for Bitcoin and altcoin addresses and transaction manipulation"; + homepage = "https://github.com/richardkiss/pycoin"; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2edef637a62..0a3cbae305cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5245,6 +5245,8 @@ in { pyaudio = callPackage ../development/python-modules/pyaudio { }; + pycoin = callPackage ../development/python-modules/pycoin { }; + pysam = callPackage ../development/python-modules/pysam { }; pysaml2 = callPackage ../development/python-modules/pysaml2 { From 3a44ede7110b47bd8fa8a4dbe027674b0ac81a12 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 17 Jun 2020 09:56:38 +0000 Subject: [PATCH 585/624] python27Packages.bitstruct: 8.10.0 -> 8.11.0 --- pkgs/development/python-modules/bitstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index aff3f70cb88a..6134d9262262 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.10.0"; + version = "8.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm"; + sha256 = "0p9d5242pkzag7ac5b5zdjyfqwxvj2jisyjghp6yhjbbwz1z44rb"; }; meta = with lib; { From 766468900924602134466108834517115f59a95c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 24 Jun 2020 17:19:30 -0400 Subject: [PATCH 586/624] nvidia_x11.legacy_390: 390.132 -> 390.138 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2ad47dbde91d..2e5b89b62405 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -34,11 +34,11 @@ rec { # Last one supporting x86 legacy_390 = generic { - version = "390.132"; - sha256_32bit = "0xgjywzkmmm6a5gby67l2kx0gn7bcxksv4wam0sqym6l1s7v5bai"; - sha256_64bit = "0qgzsajrc3xkf2jjkwip3la0f2ixp45f76nmz5cphvzrb7k2slxn"; - settingsSha256 = "07nylqzhldq1gr40q7x5424p2aml3qqnvl2zvnpzc65x2way34v6"; - persistencedSha256 = "0vab5rj9b1n9yl9674q7i88w1i5p8nhvrwsayn7i1vh4wp3m840r"; + version = "390.138"; + sha256_32bit = "0y3qjygl0kfz9qs0rp9scn1k3l8ym9dib7wpkyh5gs4klcip7xkv"; + sha256_64bit = "0rnnb5l4i8s76vlg6yvlrxhm2x9wdqw7k5hgf4fyaa3cr3k1kysz"; + settingsSha256 = "0ad6hwl56nvbdv9g85lw7ywadqvc2gaq9x6d2vjcia9kg4vrmfqx"; + persistencedSha256 = "15jciyq6i3pz1g67xzqlwmc62v3xswzhjcqmfcdndvlvhcibsimr"; }; legacy_340 = generic { From 3077af4fe6eb7806423c3e4992f4ac6805212d3e Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 24 Jun 2020 17:21:00 -0400 Subject: [PATCH 587/624] nvidia_x11: 440.82 -> 440.100 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2e5b89b62405..2c2fa40efa7f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,10 +22,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "440.82"; - sha256_64bit = "13km9800skyraa0s312fc4hwyw5pzb0jfkrv1yg6anppyan1bm7d"; - settingsSha256 = "15psxvd65wi6hmxmd2vvsp2v0m07axw613hb355nh15r1dpkr3ma"; - persistencedSha256 = "13izz9p2kg9g38gf57g3s2sw7wshp1i9m5pzljh9v82c4c22x1fw"; + version = "440.100"; + sha256_64bit = "07ygp8xs293glbybv2psi5ykfdlpgwp03bkczf51fyzknkx895k4"; + settingsSha256 = "1chis62wk4a93m49w4ncq0za4h7si6f3ckbl9ifxx7vnab8rk6ly"; + persistencedSha256 = "142fdxhznzjsnmvgpmi9x7gy6mp3n25acxfnfmf37ncs4sk0wm6i"; } else legacy_390; From f50bcf2781ed1a2048a3269502b1b7d555f246b0 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 24 Jun 2020 17:21:08 -0400 Subject: [PATCH 588/624] nvidia_x11_beta: 440.100 -> 450.51 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2c2fa40efa7f..74ebb179667e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -30,7 +30,12 @@ rec { else legacy_390; # No active beta right now - beta = stable; + beta = generic { + version = "450.51"; + sha256_64bit = "17pam9737jx9vvczma5rafa0rihprccmfz84clb1y4nhbay5alf2"; + settingsSha256 = "09hc1mjh7s94hy37rslxrxr30kx9a4yfnkmv35wn86b2p9zk3w6n"; + persistencedSha256 = "0jmri8kj6gffqn8pm8nijhq2airvgid11vj2ffc037l7z4w0s6ar"; + }; # Last one supporting x86 legacy_390 = generic { From 70cf9126842b8394a7453ffb2190e47c8e63f7a4 Mon Sep 17 00:00:00 2001 From: Arthur Carcano Date: Wed, 24 Jun 2020 22:35:10 +0200 Subject: [PATCH 589/624] sundials: 5.1.0 -> 5.3.0 --- pkgs/development/libraries/sundials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 46cf437d72ca..24980e9b709b 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -11,14 +11,14 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "sundials"; - version = "5.1.0"; + version = "5.3.0"; buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ]; nativeBuildInputs = [ cmake ]; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "08cvzmbr2qc09ayq4f5j07lw97hl06q4dl26vh4kh822mm7x28pv"; + sha256 = "19xwi7pz35s2nqgldm6r0jl2k0bs36zhbpnmmzc56s1n3bhzgpw8"; }; patches = [ From 08a69fbf4fe6ae3cd326fe627e25c11cd37b6d91 Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Sat, 18 Apr 2020 18:44:23 -0700 Subject: [PATCH 590/624] tmuxPlugins.fingers: init at 1.0.1 [tmux-fingers](https://github.com/Morantron/tmux-fingers) provides copy pasting with vimium/vimperator like hints. Use tag for tmux-fingers rev based on PR feedback Co-Authored-By: Drew --- pkgs/misc/tmux-plugins/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 23c513ea175c..74bbe1891821 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -109,6 +109,19 @@ in rec { }; }; + fingers = mkDerivation rec { + pluginName = "fingers"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "Morantron"; + repo = "tmux-fingers"; + rev = version; + sha256 = "0gp37m3d0irrsih96qv2yalvr1wmf1n64589d4qzyzq16lzyjcr0"; + fetchSubmodules = true; + }; + dependencies = [ pkgs.gawk ]; + }; + fpp = mkDerivation { pluginName = "fpp"; version = "unstable-2016-03-08"; From e09a882e2120cf68ef393034f41ea5a514d76c7c Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Wed, 24 Jun 2020 17:57:58 +0200 Subject: [PATCH 591/624] brave: 1.8.95 -> 1.10.97 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index b3261431ccd3..7924d0b59acc 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -86,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.8.95"; + version = "1.10.97"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1mlffg2v31b42gj354w5yv0yzlqc2f4f3cmdnddzkplw10jgw6f1"; + sha256 = "1qwk75k8km2sy7l3m4k5m383sl75dph4dyrp8hd65x5hnpip67yi"; }; dontConfigure = true; From 34943a7d79beabf179e04a2377ea62963547025d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 22 Jun 2020 00:02:16 +0200 Subject: [PATCH 592/624] protobuf: 3.12.0 -> 3.12.3 --- pkgs/development/libraries/protobuf/3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.12.nix b/pkgs/development/libraries/protobuf/3.12.nix index 00d9ec7f96fc..6f9add8adc2a 100644 --- a/pkgs/development/libraries/protobuf/3.12.nix +++ b/pkgs/development/libraries/protobuf/3.12.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.12.0"; - sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a"; + version = "3.12.3"; + sha256 = "0q4sn9d6x8w0zgzydfx9f7b2zdk0kiplk8h9jxyxhw6m9qn276ax"; } From 5f0cf22c59b151bb378c100d55be278e2b218851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 24 Jun 2020 07:39:37 +0200 Subject: [PATCH 593/624] cadical: enable tests --- pkgs/applications/science/logic/cadical/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index d97c12469849..e3707ff7dab1 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf"; }; + doCheck = true; dontAddPrefix = true; + installPhase = '' install -Dm0755 build/cadical "$out/bin/cadical" install -Dm0755 build/mobical "$out/bin/mobical" From 40fb898673b427fbfc2c4a0ebeb821d5aa3531be Mon Sep 17 00:00:00 2001 From: Dan Callahan Date: Thu, 25 Jun 2020 00:11:06 +0100 Subject: [PATCH 594/624] typeguard: fix tests Broken by 9993c38682d2889b784c845145d7b00c1fb126ec Traceback: tests/test_typeguard_py36.py:7: in from typing_extensions import Literal E ModuleNotFoundError: No module named 'typing_extensions' Resolved by adding typing-extensions to checkInputs --- pkgs/development/python-modules/typeguard/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index da75b7f18dca..7541d717e8a9 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -4,6 +4,7 @@ , stdenv , setuptools_scm , pytest +, typing-extensions , glibcLocales }: @@ -25,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace " --cov" "" ''; - checkInputs = [ pytest ]; + checkInputs = [ pytest typing-extensions ]; checkPhase = '' py.test . From b2c8af46fce3d3dfcfdcb255d94fc5601675247d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 25 Jun 2020 09:18:44 +1000 Subject: [PATCH 595/624] gitAndTools.gh: 0.10.0 -> 0.10.1 https://github.com/cli/cli/releases/tag/v0.10.1 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 36df07de465d..9601de85897f 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0m4qgvhd4fzl83acfbpwff0sqshyfhqiy5q4i7ly8h6rdsjysdck"; + sha256 = "0q4zpm10hcci4j0g1gx08q2qwn71ab9f7yaf4k78sfn5p89y7rm2"; }; - vendorSha256 = "0zkgdb69zm662p50sk1663lcbkw0vp8ip9blqfp6539mp9b87dn7"; + vendorSha256 = "0igbqnylryiq36lbb1gha8najijzxmn10asc0xayxygbxc16s1vi"; nativeBuildInputs = [ installShellFiles ]; From 7d3150fe8f86523fbf36db5e7181a16a7451b6e5 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 24 Jun 2020 19:54:11 -0400 Subject: [PATCH 596/624] nvidia_x11: disable i686-linux on unsupported versions --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 1d73ab8171a2..d62ade04e630 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -92,7 +92,7 @@ let homepage = "https://www.nvidia.com/object/unix.html"; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; maintainers = with maintainers; [ baracoder ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; From 22d4aed5bddc5621a5f9e5f2ae6edfe8bf6fdd28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Ga=C5=82kowski?= Date: Thu, 25 Jun 2020 02:17:56 +0200 Subject: [PATCH 597/624] unity3d: fix editor not launching due to missing libraries (#91452) --- pkgs/development/tools/unity3d/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 13ab61b55675..dfb5f6abf481 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -4,7 +4,7 @@ , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium -, libpqxx +, libpqxx, libselinux, pciutils, libpulseaudio }: let @@ -15,6 +15,8 @@ let libX11 libXcursor libXdamage libXfixes libXrender libXi libXcomposite libXext libXrandr libXtst libSM libICE libxcb libpqxx gtk3 + + libselinux pciutils libpulseaudio ]; libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ]; binPath = lib.makeBinPath [ nodejs gnutar ]; @@ -56,6 +58,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin makeWrapper $unitydir/Unity $out/bin/unity-editor \ + --prefix LD_LIBRARY_PATH : "${libPath64}" \ --prefix LD_PRELOAD : "$unitydir/libunity-nosuid.so" \ --prefix PATH : "${binPath}" ''; From c7e61112df632c52d52692388c8f4ada071f2a6c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 25 Jun 2020 12:18:37 +1000 Subject: [PATCH 598/624] treewide: remove deprecated value `Application` from makeDesktopItem --- pkgs/applications/blockchains/monero-gui/default.nix | 2 +- pkgs/applications/blockchains/wasabiwallet/default.nix | 2 +- pkgs/applications/editors/eclipse/build-eclipse.nix | 2 +- pkgs/applications/editors/netbeans/default.nix | 2 +- pkgs/applications/graphics/avocode/default.nix | 2 +- pkgs/applications/graphics/swingsane/default.nix | 2 +- pkgs/applications/misc/airtame/default.nix | 2 +- pkgs/applications/misc/dbeaver/default.nix | 2 +- pkgs/applications/misc/ganttproject-bin/default.nix | 2 +- pkgs/applications/misc/golden-cheetah/default.nix | 2 +- pkgs/applications/misc/keepass/default.nix | 2 +- pkgs/applications/misc/pdfsam-basic/default.nix | 4 ++-- pkgs/applications/misc/pgadmin/default.nix | 2 +- pkgs/applications/misc/prusa-slicer/default.nix | 2 +- pkgs/applications/misc/slic3r/default.nix | 2 +- pkgs/applications/misc/sweethome3d/default.nix | 2 +- pkgs/applications/misc/sweethome3d/editors.nix | 2 +- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- pkgs/applications/networking/browsers/palemoon/default.nix | 2 +- .../networking/instant-messengers/blink/default.nix | 2 +- .../networking/instant-messengers/jitsi/default.nix | 2 +- pkgs/applications/networking/remote/anydesk/default.nix | 2 +- pkgs/applications/office/jabref/default.nix | 2 +- pkgs/applications/science/electronics/eagle/eagle.nix | 2 +- pkgs/applications/science/electronics/eagle/eagle7.nix | 2 +- pkgs/applications/science/logic/tlaplus/toolbox.nix | 2 +- pkgs/applications/version-management/gitkraken/default.nix | 2 +- pkgs/development/python-modules/spyder/default.nix | 2 +- pkgs/development/tools/database/sqldeveloper/default.nix | 2 +- pkgs/development/tools/java/visualvm/default.nix | 2 +- pkgs/development/tools/misc/saleae-logic/default.nix | 2 +- pkgs/development/tools/misc/stm32cubemx/default.nix | 2 +- pkgs/development/tools/winpdb/default.nix | 2 +- pkgs/development/web/postman/default.nix | 2 +- pkgs/games/assaultcube/default.nix | 2 +- pkgs/games/eduke32/default.nix | 2 +- pkgs/games/frogatto/default.nix | 2 +- pkgs/games/minecraft/default.nix | 2 +- pkgs/games/runelite/default.nix | 2 +- pkgs/games/ut2004/wrapper.nix | 2 +- pkgs/misc/emulators/ccemux/default.nix | 2 +- pkgs/misc/emulators/dosbox/default.nix | 2 +- pkgs/misc/emulators/vice/default.nix | 2 +- 43 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index a135d0b3a004..89b41a6110e7 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { icon = "monero"; desktopName = "Monero"; genericName = "Wallet"; - categories = "Application;Network;Utility;"; + categories = "Network;Utility;"; }; postInstall = '' diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index db3eb37f0ae8..a098f14668e5 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { desktopName = "Wasabi"; genericName = "Bitcoin wallet"; comment = meta.description; - categories = "Application;Network;Utility;"; + categories = "Network;Utility;"; }; installPhase = '' diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 8b6a0c164e90..218fbe8fc1fc 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { comment = "Integrated Development Environment"; desktopName = "Eclipse IDE"; genericName = "Integrated Development Environment"; - categories = "Application;Development;"; + categories = "Development;"; }; buildInputs = [ diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index ecc3c058f702..7a5630bb9ba8 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -10,7 +10,7 @@ let comment = "Integrated Development Environment"; desktopName = "Apache NetBeans IDE"; genericName = "Integrated Development Environment"; - categories = "Application;Development;"; + categories = "Development;"; icon = "netbeans"; }; in diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index fa97ceb5eb2f..53779041fc90 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { icon = "avocode"; desktopName = "Avocode"; genericName = "Design Inspector"; - categories = "Application;Development;"; + categories = "Development;"; comment = "The bridge between designers and developers"; }; diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index fc9132ec0b40..ffc19653dade 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { desktopName = "SwingSane"; genericName = "Scan from local or remote SANE servers"; comment = meta.description; - categories = "Office;Application;"; + categories = "Office;"; }; in '' diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 4e1f2e8c084c..a5c08ad3642a 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { desktopName = "Airtame"; icon = name; genericName = comment; - categories = "Application;Network;"; + categories = "Network;"; }; installPhase = '' diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 6d4b4f77d2e4..0ff5aaeb79ae 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { desktopName = "dbeaver"; comment = "SQL Integrated Development Environment"; genericName = "SQL Integrated Development Environment"; - categories = "Application;Development;"; + categories = "Development;"; }; buildInputs = [ diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 2e8478f41d3d..b36bd83e70f6 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { desktopName = "GanttProject"; genericName = "Shedule and manage projects"; comment = meta.description; - categories = "Office;Application;"; + categories = "Office;"; }; javaOptions = [ diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 761d05e5f9f8..3eaefd66395c 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -12,7 +12,7 @@ let desktopName = "GoldenCheetah"; genericName = "GoldenCheetah"; comment = "Performance software for cyclists, runners and triathletes"; - categories = "Application;Utility;"; + categories = "Utility;"; }; in mkDerivation rec { pname = "golden-cheetah"; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 3a1393913ef6..ea579ce41174 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -68,7 +68,7 @@ with builtins; buildDotnetPackage rec { icon = "keepass"; desktopName = "Keepass"; genericName = "Password manager"; - categories = "Application;Utility;"; + categories = "Utility;"; mimeType = stdenv.lib.concatStringsSep ";" [ "application/x-keepass2" "" diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index d18923527851..dcf4a0a621ba 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { desktopName = "PDFsam Basic"; genericName = "PDF Split and Merge"; mimeType = "application/pdf;"; - categories = "Office;Application;"; + categories = "Office;"; }; meta = with stdenv.lib; { @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ maintainers."1000101" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 5fc0703e011b..b0aabead2457 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { exec = "pgadmin3"; icon = "pgAdmin3"; type = "Application"; - categories = "Application;Development;"; + categories = "Development;"; mimeType = "text/html"; }; in '' diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 144addf02c66..79ad84e99be4 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { comment = "G-code generator for 3D printers"; desktopName = "PrusaSlicer"; genericName = "3D printer tool"; - categories = "Application;Development;"; + categories = "Development;"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 912deee4cb1b..c8ecfbcb4a14 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { comment = "G-code generator for 3D printers"; desktopName = "Slic3r"; genericName = "3D printer tool"; - categories = "Application;Development;"; + categories = "Development;"; }; prePatch = '' diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 926db03652d6..bd0730a05aa1 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -24,7 +24,7 @@ let icon = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Application;Graphics;2DGraphics;3DGraphics;"; + categories = "Graphics;2DGraphics;3DGraphics;"; }; patchPhase = '' diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index ec759572443c..d6b44a86e087 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -20,7 +20,7 @@ let name = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Application;Graphics;2DGraphics;3DGraphics;"; + categories = "Graphics;2DGraphics;3DGraphics;"; }; buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ]; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 7505e7e21967..9e7e4bc5efa2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -85,7 +85,7 @@ let comment = ""; desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}"; genericName = "Web Browser"; - categories = "Application;Network;WebBrowser;"; + categories = "Network;WebBrowser;"; mimeType = stdenv.lib.concatStringsSep ";" [ "text/html" "text/xml" diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 8d51f5c888ad..911030dee531 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { icon = "palemoon"; desktopName = "Pale Moon"; genericName = "Web Browser"; - categories = "Application;Network;WebBrowser;"; + categories = "Network;WebBrowser;"; mimeType = lib.concatStringsSep ";" [ "text/html" "text/xml" diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index f383daa6fd02..28cc38360576 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -39,7 +39,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { desktopName = "Blink"; icon = "blink"; genericName = "Instant Messaging"; - categories = "Application;Internet;"; + categories = "Internet;"; }; dontWrapQtApps = true; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 025b66852f4a..4fb6b1852a42 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "VoIP and Instant Messaging client"; desktopName = "Jitsi"; genericName = "Instant Messaging"; - categories = "Application;X-Internet;"; + categories = "X-Internet;"; }; libPath = lib.makeLibraryPath ([ diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 9425f260e4f0..3896e06838d8 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -22,7 +22,7 @@ let icon = "anydesk"; desktopName = "AnyDesk"; genericName = description; - categories = "Application;Network;"; + categories = "Network;"; startupNotify = "false"; }; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 01ba190cf31f..7ab53b19ce04 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { name = "jabref"; desktopName = "JabRef"; genericName = "Bibliography manager"; - categories = "Application;Office;"; + categories = "Office;"; icon = "jabref"; exec = "jabref"; }; diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 4cfad20e695f..400e5e300975 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -27,7 +27,7 @@ let comment = "Schematic capture and PCB layout"; desktopName = "Eagle"; genericName = "Schematic editor"; - categories = "Application;Development;"; + categories = "Development;"; }; buildInputs = diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index af0fb675880e..5546bb910455 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { comment = "Schematic capture and PCB layout"; desktopName = "Eagle"; genericName = "Schematic editor"; - categories = "Application;Development;"; + categories = "Development;"; }; buildInputs = diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index f326d62f8f0b..5edc3e4129df 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -13,7 +13,7 @@ let comment = "IDE for TLA+"; desktopName = name; genericName = comment; - categories = "Application;Development"; + categories = "Development"; extraEntries = '' StartupWMClass=TLA+ Toolbox ''; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2afed8c099c8..64f1fc00ae7b 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { icon = "gitkraken"; desktopName = "GitKraken"; genericName = "Git Client"; - categories = "Application;Development;"; + categories = "Development;"; comment = "Graphical Git client from Axosoft"; }; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 47da1d9c0d2c..f530d0f0cdd8 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { comment = "Scientific Python Development Environment"; desktopName = "Spyder"; genericName = "Python IDE"; - categories = "Application;Development;IDE;"; + categories = "Development;IDE;"; }; postPatch = '' diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 1e40bc52b4f7..646739982cba 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -10,7 +10,7 @@ let desktopName = "Oracle SQL Developer"; genericName = "Oracle SQL Developer"; comment = "Oracle's Oracle DB GUI client"; - categories = "Application;Development;"; + categories = "Development;"; }; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index c59f6716a7b6..e55e71eeb4af 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { comment = "Java Troubleshooting Tool"; desktopName = "VisualVM"; genericName = "Java Troubleshooting Tool"; - categories = "Application;Development;"; + categories = "Development;"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index a7e197f9d7e9..b9f84edc964a 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Application;Development"; + categories = "Development"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/misc/stm32cubemx/default.nix b/pkgs/development/tools/misc/stm32cubemx/default.nix index 53336ab417cd..d4cd353281b1 100644 --- a/pkgs/development/tools/misc/stm32cubemx/default.nix +++ b/pkgs/development/tools/misc/stm32cubemx/default.nix @@ -6,7 +6,7 @@ let name = "stm32CubeMX"; exec = "stm32cubemx"; desktopName = "STM32CubeMX"; - categories = "Application;Development;"; + categories = "Development;"; icon = "stm32cubemx"; }; in diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 500fde0ef479..8db0b719c67b 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { comment = "Platform independend Python debugger"; desktopName = "Winpdb"; genericName = "Python Debugger"; - categories = "Application;Development;Debugger;"; + categories = "Development;Debugger;"; }; # Don't call gnome-terminal with "--disable-factory" flag, which is diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index f6bef241de46..a54f054577eb 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { comment = "API Development Environment"; desktopName = "Postman"; genericName = "Postman"; - categories = "Application;Development;"; + categories = "Development;"; }; buildInputs = [ diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index f40e2ecf2209..6c3a7f1168e6 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { desktopName = "AssaultCube"; comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay."; genericName = "First-person shooter"; - categories = "Application;Game;ActionGame;Shooter"; + categories = "Game;ActionGame;Shooter"; icon = "assaultcube.png"; exec = pname; }; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 60abe2964676..53baac79eed6 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -12,7 +12,7 @@ let comment = "Duke Nukem 3D port"; desktopName = "Enhanced Duke Nukem 3D"; genericName = "Duke Nukem 3D port"; - categories = "Application;Game;"; + categories = "Game;"; }; wrapper = "eduke32-wrapper"; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index 35ff97061125..efcff024a542 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -12,7 +12,7 @@ let comment = description; desktopName = "Frogatto"; genericName = "frogatto"; - categories = "Application;Game;ArcadeGame;"; + categories = "Game;ArcadeGame;"; }; version = "unstable-2018-12-18"; in buildEnv { diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 650bb223c9af..f0c35d2a569f 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -36,7 +36,7 @@ let icon = "minecraft-launcher"; comment = "Official launcher for Minecraft, a sandbox-building game"; desktopName = "Minecraft Launcher"; - categories = "Game;Application;"; + categories = "Game;"; }; envLibPath = stdenv.lib.makeLibraryPath [ diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 9b6ca4f7c057..df8a5c3e8dcd 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { terminal = "false"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; - categories = "Application;Game"; + categories = "Game"; startupNotify = null; }; diff --git a/pkgs/games/ut2004/wrapper.nix b/pkgs/games/ut2004/wrapper.nix index 31d0763be4d2..0f70a07ca8fc 100644 --- a/pkgs/games/ut2004/wrapper.nix +++ b/pkgs/games/ut2004/wrapper.nix @@ -27,7 +27,7 @@ let desktopName = "Unreal Tournament 2004"; comment = "A first-person shooter video game developed by Epic Games and Digital Extreme"; genericName = "First-person shooter"; - categories = "Application;Game;"; + categories = "Game;"; exec = "ut2004"; }; diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index fc5d4c813882..2313a63dc698 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -29,7 +29,7 @@ let comment = "A modular ComputerCraft emulator"; desktopName = "CCEmuX"; genericName = "ComputerCraft Emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; in diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index b70f0e058c07..160c8733ff5c 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = "x86 emulator with internal DOS"; desktopName = "DOSBox"; genericName = "DOS emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; postInstall = '' diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index ca3149785a4d..c80d820059fa 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { comment = "Commodore 64 emulator"; desktopName = "VICE"; genericName = "Commodore 64 emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; preBuild = '' From cd555fdab23426a655746798bd6e253eb8c08bd0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 24 Jun 2020 20:00:00 -0500 Subject: [PATCH 599/624] pythonPackages.internetarchive: 1.9.3 -> 1.9.4 --- pkgs/development/python-modules/internetarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index d862e3d2abbc..ecf39000661e 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "1.9.3"; + version = "1.9.4"; # Can't use pypi, data files for tests missing src = fetchFromGitHub { owner = "jjjake"; repo = "internetarchive"; rev = "v${version}"; - sha256 = "19av6cpps2qldfl3wb9mcirs1a48a4466m1v9k9yhdznqi4zb0ji"; + sha256 = "10xlblj21hanahsmw6lfggbrbpw08pdmvdgds1p58l8xd4fazli8"; }; propagatedBuildInputs = [ From 7b95c2781575a1cba57bc5d2f89542e6f36cf12a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 25 Jun 2020 11:20:35 +0530 Subject: [PATCH 600/624] cjdns: 20.6 -> 20.7 --- pkgs/tools/networking/cjdns/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 9a74344d2936..13388d337791 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }: -let version = "20.6"; in -stdenv.mkDerivation { - name = "cjdns-"+version; +stdenv.mkDerivation rec { + pname = "cjdns"; + version = "20.7"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; rev = "cjdns-v${version}"; - sha256 = "1d5rrnqb5dcmm5cg2ky1cgxz6ncb23n1j797j9zzw6xxdvkf3kgi"; + sha256 = "09gpqpzc00pp3cj7lyq9876p7is4bcndpdi5knqbv824vk4bj3k0"; }; buildInputs = [ which python27 nodejs ] ++ From 842acd900024e575bbc44b04b35ee18473e89de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 24 Jun 2020 19:22:05 +0200 Subject: [PATCH 601/624] xara: remove Not updated since 2006: https://en.wikipedia.org/wiki/Xara_Xtreme_LX Marked broken in nixpkgs since 2016-02-27. --- maintainers/scripts/debian-patches.sh | 2 +- .../graphics/xara/debian-patches.nix | 30 ------------------- .../graphics/xara/debian-patches.txt | 7 ----- pkgs/applications/graphics/xara/default.nix | 22 -------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 pkgs/applications/graphics/xara/debian-patches.nix delete mode 100644 pkgs/applications/graphics/xara/debian-patches.txt delete mode 100644 pkgs/applications/graphics/xara/default.nix diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh index b4923fb537e9..de6be136ca77 100755 --- a/maintainers/scripts/debian-patches.sh +++ b/maintainers/scripts/debian-patches.sh @@ -2,7 +2,7 @@ # Download patches from debian project # Usage $0 debian-patches.txt debian-patches.nix -# An example input and output files can be found in applications/graphics/xara/ +# An example input and output files can be found in tools/graphics/plotutils DEB_URL=https://sources.debian.org/data/main declare -a deb_patches diff --git a/pkgs/applications/graphics/xara/debian-patches.nix b/pkgs/applications/graphics/xara/debian-patches.nix deleted file mode 100644 index dd3061461868..000000000000 --- a/pkgs/applications/graphics/xara/debian-patches.nix +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by debian-patches.sh from debian-patches.txt -let - prefix = "http://patch-tracker.debian.org/patch/series/dl/xaralx/0.7r1785-5"; -in -[ - { - url = "${prefix}/30_gtk_wxwidgets_symbol_clash"; - sha256 = "1rc9dh9mnp93mad96dkp7idyhhcw7h6w0g5s92mqgzj79hqgaziz"; - } - { - url = "${prefix}/40_algorithm_include"; - sha256 = "03jhl1qnxj7nl8malf6v1y24aldfz87x1p2jxp04mrr35nzvyyc0"; - } - { - url = "${prefix}/50_update_imagemagick_version_parser"; - sha256 = "1nilsqghlr649sc14n1aqkhdx7f66rq91gqccdpi17jwijs27497"; - } - { - url = "${prefix}/remove-icon-suffix"; - sha256 = "160zmkgwlsanqivnip89558yvd9zvqp8ks2wbyr2aigl2rafin22"; - } - { - url = "${prefix}/45_fix_gcc4"; - sha256 = "06zsj0z9v5n557gj8337v6xd26clbvm4dc0qhvpvzbisq81l9jyi"; - } - { - url = "${prefix}/55_fix_contstuctor_call"; - sha256 = "0b14glrcwhv0ja960h56n5jm4f9563ladap2pgaywihq485ql1c1"; - } -] diff --git a/pkgs/applications/graphics/xara/debian-patches.txt b/pkgs/applications/graphics/xara/debian-patches.txt deleted file mode 100644 index 5c95d401a323..000000000000 --- a/pkgs/applications/graphics/xara/debian-patches.txt +++ /dev/null @@ -1,7 +0,0 @@ -xaralx/0.7r1785-5 -30_gtk_wxwidgets_symbol_clash -40_algorithm_include -50_update_imagemagick_version_parser -remove-icon-suffix -45_fix_gcc4 -55_fix_contstuctor_call diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix deleted file mode 100644 index 5e3c252435cd..000000000000 --- a/pkgs/applications/graphics/xara/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig -, wxGTK, gtk2, perl, zip}: - -stdenv.mkDerivation { - name = "xaralx-0.7r1785"; - - src = fetchurl { - url = "http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2"; - sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; - }; - - nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; - buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; - - configureFlags = [ "--disable-svnversion" ]; - - patches = map fetchurl (import ./debian-patches.nix); - - prePatch = "patchShebangs Scripts"; - - meta.broken = true; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 64392f49a52e..f9487820bafd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -626,6 +626,7 @@ mapAliases ({ xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 x11 = xlibsWrapper; # added 2015-09 + xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPlugins; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d21aa51ebf1e..fbbfedf068db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23120,8 +23120,6 @@ in libpng = libpng12; }; - xara = callPackage ../applications/graphics/xara { }; - xastir = callPackage ../applications/misc/xastir { rastermagick = imagemagick; inherit (xorg) libXt; From bbed0260451c93a2b56b7ab2e8659385fa8aee3c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 20 Jun 2020 09:27:33 +0200 Subject: [PATCH 602/624] ocamlPackages.base64_2: remove at 2.0.0 --- pkgs/development/ocaml-modules/base64/2.0.nix | 25 ------------------- pkgs/top-level/ocaml-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/base64/2.0.nix diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix deleted file mode 100644 index a49e0e8a778e..000000000000 --- a/pkgs/development/ocaml-modules/base64/2.0.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: - -let version = "2.0.0"; in - -stdenv.mkDerivation { - pname = "ocaml-base64"; - inherit version; - - src = fetchzip { - url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; - sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; - }; - - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; - - meta = { - homepage = "https://github.com/mirage/ocaml-base64"; - platforms = ocaml.meta.platforms or []; - description = "Base64 encoding and decoding in OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1ff7c8a51989..194abc496f25 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -42,8 +42,6 @@ let atdgen = callPackage ../development/ocaml-modules/atdgen { }; - base64_2 = callPackage ../development/ocaml-modules/base64/2.0.nix { }; - base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { From 9842aa383e4939f5b9aeb998f2a8d4f6671007f2 Mon Sep 17 00:00:00 2001 From: Jos van Bakel Date: Wed, 24 Jun 2020 21:42:41 +0200 Subject: [PATCH 603/624] python3Packages.pytest-xvfb: 1.2.0 -> 2.0.0 --- pkgs/development/python-modules/pytest-xvfb/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix index b9ae9be428d3..64078d68a8b8 100644 --- a/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -3,15 +3,17 @@ , fetchPypi , pytest , virtual-display +, isPy27 }: buildPythonPackage rec { pname = "pytest-xvfb"; - version = "1.2.0"; + version = "2.0.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a7544ca8d0c7c40db4b40d7a417a7b071c68d6ef6bdf9700872d7a167302f979"; + sha256 = "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4"; }; propagatedBuildInputs = [ From 10496b449b33673c2fbe42a00f6e6f7426192085 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Jun 2020 09:52:44 +0200 Subject: [PATCH 604/624] =?UTF-8?q?ocamlPackages.torch:=200.8=20=E2=86=92?= =?UTF-8?q?=200.9b?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/torch/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 457259bb1bbd..3ae9b44eba97 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildDunePackage , fetchFromGitHub , cmdliner @@ -15,17 +15,15 @@ buildDunePackage rec { pname = "torch"; - version = "0.8"; - - owner = "LaurentMazare"; + version = "0.9b"; minimumOCamlVersion = "4.07"; src = fetchFromGitHub { - inherit owner; + owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "19w31paj24pns2ahk9j9rgpkb5hpcd41kfaarxrlddww5dl6pxvi"; + sha256 = "1xn8zfs3viz80agckcpl9a4vjbq6j5g280i95jyy5s0zbcnajpnm"; }; propagatedBuildInputs = [ @@ -47,7 +45,7 @@ buildDunePackage rec { doCheck = true; checkPhase = "dune runtest"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Ocaml bindings to Pytorch"; maintainers = [ maintainers.bcdarwin ]; From 93574e51613df32aad8672d0aa36ebe1e957c920 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 25 Jun 2020 02:59:23 +0300 Subject: [PATCH 605/624] asuka: init at 0.8.0 --- .../browsers/asuka/cargo-lock.patch | 1351 +++++++++++++++++ .../networking/browsers/asuka/default.nix | 28 + pkgs/top-level/all-packages.nix | 4 + 3 files changed, 1383 insertions(+) create mode 100644 pkgs/applications/networking/browsers/asuka/cargo-lock.patch create mode 100644 pkgs/applications/networking/browsers/asuka/default.nix diff --git a/pkgs/applications/networking/browsers/asuka/cargo-lock.patch b/pkgs/applications/networking/browsers/asuka/cargo-lock.patch new file mode 100644 index 000000000000..1d3990bc62fa --- /dev/null +++ b/pkgs/applications/networking/browsers/asuka/cargo-lock.patch @@ -0,0 +1,1351 @@ +diff --git i/Cargo.lock w/Cargo.lock +index 6807c00..00b2c60 100644 +--- i/Cargo.lock ++++ w/Cargo.lock +@@ -4,29 +4,34 @@ + name = "aho-corasick" + version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" + dependencies = [ +- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", + ] + + [[package]] + name = "arc-swap" + version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7b8a9123b8027467bce0099fe556c628a53c8d83df0507084c31e9ba2e39aff" + + [[package]] + name = "array-macro" + version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d034edd76d4e7adc314c95400941dedc89bd4337d565bf87f6b69d3b20dc4de" + + [[package]] + name = "arrayref" + version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" + + [[package]] + name = "arrayvec" + version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" + + [[package]] + name = "asuka" +@@ -38,8 +43,6 @@ dependencies = [ + "lazy_static", + "native-tls", + "open", +- "openssl", +- "openssl-sys", + "regex", + "tempfile", + "textwrap", +@@ -50,769 +53,861 @@ dependencies = [ + name = "autocfg" + version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + + [[package]] + name = "backtrace" + version = "0.3.40" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" + dependencies = [ +- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace-sys", ++ "cfg-if", ++ "libc", ++ "rustc-demangle", + ] + + [[package]] + name = "backtrace-sys" + version = "0.1.32" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" + dependencies = [ +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", + ] + + [[package]] + name = "base64" + version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" + dependencies = [ +- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", + ] + + [[package]] + name = "bitflags" + version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + + [[package]] + name = "blake2b_simd" + version = "0.5.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0" + dependencies = [ +- "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", + ] + + [[package]] + name = "byteorder" + version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" + + [[package]] + name = "c2-chacha" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" + dependencies = [ +- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", + ] + + [[package]] + name = "cc" + version = "1.0.47" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" + + [[package]] + name = "cfg-if" + version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + + [[package]] + name = "chrono" + version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" + dependencies = [ +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "num-integer", ++ "num-traits", ++ "time", + ] + + [[package]] + name = "cloudabi" + version = "0.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", + ] + + [[package]] + name = "constant_time_eq" + version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" + + [[package]] + name = "core-foundation" + version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" + dependencies = [ +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", + ] + + [[package]] + name = "core-foundation-sys" + version = "0.6.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + + [[package]] + name = "crossbeam-channel" + version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" + dependencies = [ +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-utils" + version = "0.6.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "lazy_static", + ] + + [[package]] + name = "cursive" + version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6261747aa936aab19fc4ac3a2c1a8eee8fb5862ba96fb1e524ee56cb520d9caf" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "enum-map 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "enumset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "ncurses 5.99.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "xi-unicode 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "chrono", ++ "crossbeam-channel", ++ "enum-map", ++ "enumset", ++ "hashbrown", ++ "lazy_static", ++ "libc", ++ "log", ++ "maplit", ++ "ncurses", ++ "num", ++ "owning_ref", ++ "signal-hook", ++ "term_size", ++ "toml", ++ "unicode-segmentation", ++ "unicode-width", ++ "xi-unicode", + ] + + [[package]] + name = "darling" + version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" + dependencies = [ +- "darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "darling_macro 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "darling_core", ++ "darling_macro", + ] + + [[package]] + name = "darling_core" + version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" + dependencies = [ +- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fnv", ++ "ident_case", ++ "proc-macro2", ++ "quote", ++ "strsim", ++ "syn", + ] + + [[package]] + name = "darling_macro" + version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" + dependencies = [ +- "darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "darling_core", ++ "quote", ++ "syn", + ] + + [[package]] + name = "dirs" + version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "dirs-sys", + ] + + [[package]] + name = "dirs-sys" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "redox_users", ++ "winapi 0.3.8", + ] + + [[package]] + name = "enum-map" + version = "0.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75eb4afb8170adb4120b13700c1af58c3137cd72e4c56e282045af5c29ab5329" + dependencies = [ +- "array-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "enum-map-derive 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "array-macro", ++ "enum-map-derive", + ] + + [[package]] + name = "enum-map-derive" + version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e57001dfb2532f5a103ff869656887fae9a8defa7d236f3e39d2ee86ed629ad7" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] + name = "enumset" + version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57b811aef4ff1cc938f13bbec348f0ecbfc2bb565b7ab90161c9f0b2805edc8a" + dependencies = [ +- "enumset_derive 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "enumset_derive", ++ "num-traits", + ] + + [[package]] + name = "enumset_derive" + version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b184c2d0714bbeeb6440481a19c78530aa210654d99529f13d2f860a1b447598" + dependencies = [ +- "darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "darling", ++ "proc-macro2", ++ "quote", ++ "syn", + ] + + [[package]] + name = "failure" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" + dependencies = [ +- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)", +- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "backtrace", ++ "failure_derive", + ] + + [[package]] + name = "failure_derive" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", + ] + + [[package]] + name = "fnv" + version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" + + [[package]] + name = "foreign-types" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" + dependencies = [ +- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types-shared", + ] + + [[package]] + name = "foreign-types-shared" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + + [[package]] + name = "fuchsia-cprng" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + + [[package]] + name = "getrandom" + version = "0.1.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", + ] + + [[package]] + name = "hashbrown" + version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" + + [[package]] + name = "ident_case" + version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + + [[package]] + name = "idna" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", + ] + + [[package]] + name = "json" + version = "0.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3ca41abbeb7615d56322a984e63be5e5d0a117dfaca86c14393e32a762ccac1" + + [[package]] + name = "kernel32-sys" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" + dependencies = [ +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8", ++ "winapi-build", + ] + + [[package]] + name = "lazy_static" + version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" + version = "0.2.65" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" + + [[package]] + name = "log" + version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", + ] + + [[package]] + name = "maplit" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + + [[package]] + name = "matches" + version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + + [[package]] + name = "maybe-uninit" + version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + + [[package]] + name = "memchr" + version = "2.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" + + [[package]] + name = "native-tls" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)", +- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", + ] + + [[package]] + name = "ncurses" + version = "5.99.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "15699bee2f37e9f8828c7b35b2bc70d13846db453f2d507713b758fabe536b82" + dependencies = [ +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", ++ "pkg-config", + ] + + [[package]] + name = "num" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" + dependencies = [ +- "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-complex", ++ "num-integer", ++ "num-iter", ++ "num-rational", ++ "num-traits", + ] + + [[package]] + name = "num-complex" + version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-traits", + ] + + [[package]] + name = "num-integer" + version = "0.1.41" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-traits", + ] + + [[package]] + name = "num-iter" + version = "0.1.39" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-integer", ++ "num-traits", + ] + + [[package]] + name = "num-rational" + version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", +- "num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "num-integer", ++ "num-traits", + ] + + [[package]] + name = "num-traits" + version = "0.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "443c53b3c3531dfcbfa499d8893944db78474ad7a1d87fa2d94d1a2231693ac6" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", + ] + + [[package]] + name = "open" + version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94b424e1086328b0df10235c6ff47be63708071881bead9e76997d9291c0134b" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "openssl" + version = "0.10.25" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449" + dependencies = [ +- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "lazy_static", ++ "libc", ++ "openssl-sys", + ] + + [[package]] + name = "openssl-probe" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + + [[package]] + name = "openssl-sys" + version = "0.9.52" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc" + dependencies = [ +- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", +- "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", + ] + + [[package]] + name = "owning_ref" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" + dependencies = [ +- "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "stable_deref_trait", + ] + + [[package]] + name = "percent-encoding" + version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + + [[package]] + name = "pkg-config" + version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" + + [[package]] + name = "ppv-lite86" + version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + + [[package]] + name = "proc-macro2" + version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" + dependencies = [ +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", + ] + + [[package]] + name = "quote" + version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", + ] + + [[package]] + name = "rand" + version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" + dependencies = [ +- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core 0.5.1", ++ "rand_hc", + ] + + [[package]] + name = "rand_chacha" + version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" + dependencies = [ +- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "c2-chacha", ++ "rand_core 0.5.1", + ] + + [[package]] + name = "rand_core" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" + dependencies = [ +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", + ] + + [[package]] + name = "rand_core" + version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + + [[package]] + name = "rand_core" + version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" + dependencies = [ +- "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", + ] + + [[package]] + name = "rand_hc" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" + dependencies = [ +- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1", + ] + + [[package]] + name = "rand_os" + version = "0.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" + dependencies = [ +- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.4.2", ++ "rdrand", ++ "winapi 0.3.8", + ] + + [[package]] + name = "rdrand" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" + dependencies = [ +- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", + ] + + [[package]] + name = "redox_syscall" + version = "0.1.56" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + + [[package]] + name = "redox_users" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" + dependencies = [ +- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "failure", ++ "rand_os", ++ "redox_syscall", ++ "rust-argon2", + ] + + [[package]] + name = "regex" + version = "1.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" + dependencies = [ +- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", +- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", + ] + + [[package]] + name = "regex-syntax" + version = "0.6.12" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" + + [[package]] + name = "remove_dir_all" + version = "0.5.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" + dependencies = [ +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8", + ] + + [[package]] + name = "rust-argon2" + version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" + dependencies = [ +- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", +- "blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", +- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64", ++ "blake2b_simd", ++ "crossbeam-utils", + ] + + [[package]] + name = "rustc-demangle" + version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" + + [[package]] + name = "schannel" + version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "winapi 0.3.8", + ] + + [[package]] + name = "security-framework" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "301c862a6d0ee78f124c5e1710205965fc5c553100dcda6d98f13ef87a763f04" + dependencies = [ +- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", + ] + + [[package]] + name = "security-framework-sys" + version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" + dependencies = [ +- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", + ] + + [[package]] + name = "serde" + version = "1.0.102" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" + + [[package]] + name = "signal-hook" + version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb543aecec4ba8b867f41284729ddfdb7e8fcd70ec3d7d37fca3007a4b53675f" + dependencies = [ +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "signal-hook-registry", + ] + + [[package]] + name = "signal-hook-registry" + version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" + dependencies = [ +- "arc-swap 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", ++ "arc-swap", ++ "libc", + ] + + [[package]] + name = "smallvec" + version = "0.6.13" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" + dependencies = [ +- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "maybe-uninit", + ] + + [[package]] + name = "stable_deref_trait" + version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" + + [[package]] + name = "strsim" + version = "0.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" + + [[package]] + name = "syn" + version = "1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", + ] + + [[package]] + name = "synstructure" + version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" + dependencies = [ +- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", + ] + + [[package]] + name = "tempfile" + version = "3.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" + dependencies = [ +- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi 0.3.8", + ] + + [[package]] + name = "term_size" + version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" + dependencies = [ +- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys", ++ "libc", ++ "winapi 0.2.8", + ] + + [[package]] +@@ -828,225 +923,126 @@ dependencies = [ + name = "thread_local" + version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" + dependencies = [ +- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", + ] + + [[package]] + name = "time" + version = "0.1.42" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" + dependencies = [ +- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.8", + ] + + [[package]] + name = "toml" + version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" + dependencies = [ +- "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde", + ] + + [[package]] + name = "unicode-bidi" + version = "0.3.4" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" + dependencies = [ +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", + ] + + [[package]] + name = "unicode-normalization" + version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" + dependencies = [ +- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec", + ] + + [[package]] + name = "unicode-segmentation" + version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" + + [[package]] + name = "unicode-width" + version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" + + [[package]] + name = "unicode-xid" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" + + [[package]] + name = "url" + version = "2.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" + dependencies = [ +- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", +- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna", ++ "matches", ++ "percent-encoding", + ] + + [[package]] + name = "vcpkg" + version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" + + [[package]] + name = "wasi" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" + + [[package]] + name = "winapi" + version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + + [[package]] + name = "winapi" + version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" + dependencies = [ +- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", + ] + + [[package]] + name = "winapi-build" + version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + + [[package]] + name = "winapi-i686-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "xi-unicode" + version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +- +-[metadata] +-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +-"checksum arc-swap 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d7b8a9123b8027467bce0099fe556c628a53c8d83df0507084c31e9ba2e39aff" +-"checksum array-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7d034edd76d4e7adc314c95400941dedc89bd4337d565bf87f6b69d3b20dc4de" +-"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" +-"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +-"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +-"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" +-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" +-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +-"checksum blake2b_simd 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b83b7baab1e671718d78204225800d6b170e648188ac7dc992e9d6bddf87d0c0" +-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +-"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" +-"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" +-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +-"checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" +-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +-"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" +-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" +-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +-"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +-"checksum cursive 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261747aa936aab19fc4ac3a2c1a8eee8fb5862ba96fb1e524ee56cb520d9caf" +-"checksum darling 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +-"checksum darling_core 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +-"checksum darling_macro 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +-"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +-"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +-"checksum enum-map 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75eb4afb8170adb4120b13700c1af58c3137cd72e4c56e282045af5c29ab5329" +-"checksum enum-map-derive 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e57001dfb2532f5a103ff869656887fae9a8defa7d236f3e39d2ee86ed629ad7" +-"checksum enumset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "57b811aef4ff1cc938f13bbec348f0ecbfc2bb565b7ab90161c9f0b2805edc8a" +-"checksum enumset_derive 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b184c2d0714bbeeb6440481a19c78530aa210654d99529f13d2f860a1b447598" +-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" +-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" +-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +-"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" +-"checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353" +-"checksum ident_case 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +-"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +-"checksum json 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3ca41abbeb7615d56322a984e63be5e5d0a117dfaca86c14393e32a762ccac1" +-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +-"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +-"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" +-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +-"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" +-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +-"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +-"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" +-"checksum ncurses 5.99.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15699bee2f37e9f8828c7b35b2bc70d13846db453f2d507713b758fabe536b82" +-"checksum num 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cf4825417e1e1406b3782a8ce92f4d53f26ec055e3622e1881ca8e9f5f9e08db" +-"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" +-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" +-"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" +-"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454" +-"checksum num-traits 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "443c53b3c3531dfcbfa499d8893944db78474ad7a1d87fa2d94d1a2231693ac6" +-"checksum open 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "94b424e1086328b0df10235c6ff47be63708071881bead9e76997d9291c0134b" +-"checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449" +-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +-"checksum openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc" +-"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" +-"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +-"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +-"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" +-"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" +-"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +-"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412" +-"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +-"checksum redox_users 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecedbca3bf205f8d8f5c2b44d83cd0690e39ee84b951ed649e9f1841132b66d" +-"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" +-"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" +-"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +-"checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" +-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +-"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" +-"checksum security-framework 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "301c862a6d0ee78f124c5e1710205965fc5c553100dcda6d98f13ef87a763f04" +-"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" +-"checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" +-"checksum signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cb543aecec4ba8b867f41284729ddfdb7e8fcd70ec3d7d37fca3007a4b53675f" +-"checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc" +-"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +-"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +-"checksum strsim 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "032c03039aae92b350aad2e3779c352e104d919cb192ba2fabbd7b831ce4f0f6" +-"checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" +-"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +-"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" +-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +-"checksum toml 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "01d1404644c8b12b16bfcffa4322403a91a451584daaaa7c28d3152e6cbc98cf" +-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +-"checksum unicode-normalization 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "09c8070a9942f5e7cfccd93f490fdebd230ee3c3c9f107cb25bad5351ef671cf" +-"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +-"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20" +-"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +-"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" +-"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" +-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +-"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" +-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-"checksum xi-unicode 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7395cdb9d0a6219fa0ea77d08c946adf9c1984c72fcd443ace30365f3daadef7" ++checksum = "7395cdb9d0a6219fa0ea77d08c946adf9c1984c72fcd443ace30365f3daadef7" diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix new file mode 100644 index 000000000000..458ab3064a95 --- /dev/null +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "asuka"; + version = "0.8.0"; + + src = fetchurl { + url = "https://git.sr.ht/~julienxx/${pname}/archive/${version}.tar.gz"; + sha256 = "10hmsdwf2nrsmpycqa08vd31c6vhx7w5fhvv5a9f92sqp0lcavf0"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0csj63x77nkdh543pzl9cbaip6xp8anw0942hc6j19y7yicd29ns"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ ncurses openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "Gemini Project client written in Rust with NCurses"; + homepage = "https://git.sr.ht/~julienxx/asuka"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d88c63bcfb0..05e00e0b1c5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18809,6 +18809,10 @@ in arora = callPackage ../applications/networking/browsers/arora { }; + asuka = callPackage ../applications/networking/browsers/asuka { + inherit (darwin.apple_sdk.frameworks) Security; + }; + artha = callPackage ../applications/misc/artha { }; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; From 0d0906d42b00bcfe157d52ebd908a43a364b67e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 25 Jun 2020 08:58:02 +0000 Subject: [PATCH 606/624] python37Packages.lazr-uri: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/lazr-uri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazr-uri/default.nix b/pkgs/development/python-modules/lazr-uri/default.nix index d6b3cc29324c..e92786253831 100644 --- a/pkgs/development/python-modules/lazr-uri/default.nix +++ b/pkgs/development/python-modules/lazr-uri/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lazr.uri"; - version = "1.0.3"; + version = "1.0.4"; disabled = isPy27; # namespace is broken for python2 src = fetchPypi { inherit pname version; - sha256 = "5c620b5993c8c6a73084176bfc51de64972b8373620476ed841931a49752dc8b"; + sha256 = "1griz2r0vhi9k91wfhlx5cx7y3slkfyzyqldaa9i0zp850iqz0q2"; }; propagatedBuildInputs = [ setuptools ]; From 73e514993a0784227aa79968d828cb8d22df9849 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 25 Jun 2020 10:24:00 +0100 Subject: [PATCH 607/624] pytest-freezgun: init at 0.4.1 --- .../pytest-freezegun/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-freezegun/default.nix diff --git a/pkgs/development/python-modules/pytest-freezegun/default.nix b/pkgs/development/python-modules/pytest-freezegun/default.nix new file mode 100644 index 000000000000..8809bc143cb0 --- /dev/null +++ b/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, freezegun +, pytest +}: + +buildPythonPackage rec { + pname = "pytest-freezegun"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "060cdf192848e50a4a681a5e73f8b544c4ee5ebc1fab3cb7223a0097bac2f83f"; + }; + + propagatedBuildInputs = [ + freezegun + pytest + ]; + + meta = with lib; { + description = "Wrap tests with fixtures in freeze_time"; + homepage = "https://github.com/ktosiek/pytest-freezegun"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a3cbae305cd..c75b84e8ede7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -950,6 +950,8 @@ in { mpi = pkgs.openmpi; }; + pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; + python-baseconv = callPackage ../development/python-modules/python-baseconv { }; pycognito = callPackage ../development/python-modules/pycognito { }; From 2a4930648262a87837f217f5997bbb44ae994ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 25 Jun 2020 10:25:05 +0100 Subject: [PATCH 608/624] python3.pkgs.jaraco_itertools: fix build --- ...t-run-flake8-checks-during-the-build.patch | 27 +++++++++++++++++++ .../jaraco_itertools/default.nix | 5 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch new file mode 100644 index 000000000000..2dcf7d648626 --- /dev/null +++ b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch @@ -0,0 +1,27 @@ +From fd56b0d85393d684bd3bf99f33d8638da884282f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Thu, 25 Jun 2020 09:52:11 +0100 +Subject: [PATCH] disable flake8/black8/coverage from tests +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + pytest.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pytest.ini b/pytest.ini +index 5027d34..4e2a2d2 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,5 +1,5 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 --black --cov ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES + filterwarnings= +-- +2.27.0 + diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 7f1d954f68d2..5df70b6da97b 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -12,6 +12,11 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools_scm ]; + + patches = [ + ./0001-Don-t-run-flake8-checks-during-the-build.patch + ]; + propagatedBuildInputs = [ inflect more-itertools six ]; checkInputs = [ pytest ]; From 01531115752a557df0a8e5064d60707c256fb400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 25 Jun 2020 10:24:38 +0100 Subject: [PATCH 609/624] python3.pkgs.tempora: fix tests --- ...-pytest-remove-flake8-black-coverage.patch | 28 +++++++++++++++++++ .../python-modules/tempora/default.nix | 14 ++++++---- 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch diff --git a/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch b/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch new file mode 100644 index 000000000000..f807a6d2515e --- /dev/null +++ b/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch @@ -0,0 +1,28 @@ +From 9dfd2a8fac4a643fd007390762ccc8564588b4bf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Thu, 25 Jun 2020 10:16:52 +0100 +Subject: [PATCH] pytest: remove flake8/black/coverage +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + pytest.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pytest.ini b/pytest.ini +index bd6998d..a464529 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,6 +1,6 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 --black --cov ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS + filterwarnings= + # suppress known warning +-- +2.27.0 + diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 9b54953d28ce..11a98bd370be 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,6 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools_scm, pytest, freezegun, backports_unittest-mock -, pytest-black, pytestcov, pytest-flake8 +, setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools }: buildPythonPackage rec { @@ -14,13 +13,18 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; + patches = [ + ./0001-pytest-remove-flake8-black-coverage.patch + ]; + propagatedBuildInputs = [ six pytz jaraco_functools ]; - checkInputs = [ pytest pytest-flake8 pytest-black pytestcov freezegun backports_unittest-mock ]; + checkInputs = [ + pytest-freezegun pytest freezegun backports_unittest-mock + ]; - # missing pytest-freezegun package checkPhase = '' - pytest -k 'not get_nearest_year_for_day' + pytest ''; meta = with lib; { From b422dd62ce667b01939d19edff4eb1fe1df40b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 25 Jun 2020 12:27:54 +0100 Subject: [PATCH 610/624] python3.pkgs.tempora: no longer compatible with python2 --- pkgs/development/python-modules/tempora/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 11a98bd370be..d4139ce76218 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock -, six, pytz, jaraco_functools }: +, six, pytz, jaraco_functools, pythonOlder }: buildPythonPackage rec { pname = "tempora"; @@ -11,6 +11,8 @@ buildPythonPackage rec { sha256 = "e370d822cf48f5356aab0734ea45807250f5120e291c76712a1d766b49ae34f8"; }; + disabled = pythonOlder "3.2"; + nativeBuildInputs = [ setuptools_scm ]; patches = [ From 3ff2165d4d43a42b2b9dec7a8366e49bf2db1f26 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 11 Mar 2020 07:57:33 +0100 Subject: [PATCH 611/624] amdvlk: init at 2020.Q2.5 --- pkgs/development/libraries/amdvlk/default.nix | 85 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/libraries/amdvlk/default.nix diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix new file mode 100644 index 000000000000..84b4d53bc56f --- /dev/null +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -0,0 +1,85 @@ +{ stdenv +, lib +, fetchpatch +, fetchRepoProject +, cmake +, ninja +, patchelf +, perl +, pkgconfig +, python3 +, expat +, libdrm +, ncurses +, openssl +, wayland +, xorg +, zlib +}: + +stdenv.mkDerivation rec { + pname = "amdvlk"; + version = "2020.Q2.5"; + + src = fetchRepoProject { + name = "${pname}-src"; + manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; + rev = "refs/tags/v-${version}"; + sha256 = "008adby8vx12ma155x64n7aj9vp9ygqgij3mm3q20i187db7d1ab"; + }; + + buildInputs = [ + expat + ncurses + openssl + wayland + xorg.libX11 + xorg.libxcb + xorg.xcbproto + xorg.libXext + xorg.libXrandr + xorg.libXft + xorg.libxshmfence + zlib + ]; + + nativeBuildInputs = [ + cmake + ninja + patchelf + perl + pkgconfig + python3 + ]; + + rpath = lib.makeLibraryPath [ + libdrm + stdenv.cc.cc.lib + xorg.libX11 + xorg.libxcb + xorg.libxshmfence + ]; + + cmakeDir = "../drivers/xgl"; + + installPhase = '' + install -Dm755 -t $out/lib icd/amdvlk64.so + install -Dm644 -t $out/share/vulkan/icd.d ../drivers/AMDVLK/json/Redhat/amd_icd64.json + + substituteInPlace $out/share/vulkan/icd.d/amd_icd64.json --replace \ + "/usr/lib64" "$out/lib" + + patchelf --set-rpath "$rpath" $out/lib/amdvlk64.so + ''; + + # Keep the rpath, otherwise vulkaninfo and vkcube segfault + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "AMD Open Source Driver For Vulkan"; + homepage = "https://github.com/GPUOpen-Drivers/AMDVLK"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d21aa51ebf1e..787697220459 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11261,6 +11261,8 @@ in allegro4 = callPackage ../development/libraries/allegro {}; allegro5 = callPackage ../development/libraries/allegro/5.nix {}; + amdvlk = callPackage ../development/libraries/amdvlk {}; + amrnb = callPackage ../development/libraries/amrnb { }; amrwb = callPackage ../development/libraries/amrwb { }; From de35d8cdaa31422c7a591650718eceeb91f74a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 25 Jun 2020 13:05:32 +0100 Subject: [PATCH 612/624] gcc_latest: add alias Our gcc version often lacks behind the latest supported version. To get the latest possible gcc version with all optimization/checks, this RFC adds an gcc_latest alias. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a7bbe3ac539..852dcca5bc60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8475,6 +8475,8 @@ in isl = if !stdenv.isDarwin then isl_0_17 else null; })); + gcc_latest = gcc10; + gfortran = gfortran9; gfortran48 = wrapCC (gcc48.cc.override { From 5f057dd755580f0a7fff5b08208f97eb58c053ee Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 25 Jun 2020 14:46:26 +0200 Subject: [PATCH 613/624] firefox-beta-bin: 78.0b2 -> 78.0b9 --- .../browsers/firefox-bin/beta_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 601e4a77db5b..f9565a4f8a8c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "78.0b2"; + version = "78.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ach/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ach/firefox-78.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f70d001f2415f46f0a2fddb7a3de19d0b4be6fb185b1e4e875bb3f374b9e73f65369117b197ddeea7cea72bf8993984ff166d0a58dd9fcea1a555db19df242af"; + sha512 = "fdab8b20137ff4c5491d6d8888d3ed96939f167376b4de9a2636b055a936e1b18e458cbb9ebbe34a65021907fb97cb6367470083dc74a46d7a3cd15bfc008f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/af/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/af/firefox-78.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "9376bfa53068581a4bcbbf2fa7fe946d3ae006770edef1060f82b0c1722c90712c65cd86e89292c03167bebbe3e67c5b3215b88e11681c723f430470f84e685c"; + sha512 = "26c94bf548812dd7641e9ed2a741cca0732e5691ba391da684f2229abd50e78795740b04b4cd7d6e8b66d8d6098360d1f115bf9cf6216483093fc7298328bd32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/an/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/an/firefox-78.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "51b4294f4ecd8716b875060b219af558df8298113c487f24a23c0e598ef7c5516fdab9a888022c4ad6679efdf0cd86cdb601179c146e6b97ccd332d22f0d08a6"; + sha512 = "fbff456586aea9dfa174fef02d056efb7f4b85f085f6e59e879e5ddc8414f5f0c1089e14832ace1086cf11b7bb6d1f58d34df6b38dc79c8b3ec420f64645923d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ar/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ar/firefox-78.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "4fc9a968ffaa96019819603ab9788ef0580f43da222c899c1af68db2e8f4e9d056356ea99d27481bb9b7eb451504bbe31fb857bd511d1862cb366ad4177616e2"; + sha512 = "5cc255be9a6ba2c559be5f882211254264ed4bdb5871cbdc6a6edf34c2ed9d6fe399d85a978c146f0da26260c741f5887c33b68c85acee1ea1f72a0d1473a033"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ast/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ast/firefox-78.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "c70026f3a7ec4572750c01df1d7ab5859afd91dd12b242534c5afbfeaf99dfe2585655d5d87d861f5211cef6cf67a0ab177190adcfca0697a89c7a6f7de022c4"; + sha512 = "1ec2408d738be67191e7f19bda47c180ff13b5eb6af54ed6aeab4105eff493b2ac185141deb8446ef7e474207f3c78518d15e9e9dada173905bb6f3fb96babf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/az/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/az/firefox-78.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "005b79149215e2f85851900e08ffb1214f8b100a0a1bcf73365115769f8744e687f9b0ff8500a40cc48dc53cb203d33b757153266157cda3406532e5a1cb0c5a"; + sha512 = "375b60d1c023594b4d5a09d2b8d0d1b36942f7083a6cfbd577ebc5256970b4c4c9e81631f4e3671eb52597b661d220da701eabfcde180fa01fe3ede5c1ad8c14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/be/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/be/firefox-78.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "11e1ec1146b0688ccadf1c9ce4c219a722533ecd00a3df828e0519c2b49bdb66280aee053254fecd00fc90e0d577de167ea3c1e146e2f9c351b9bfe4756c21eb"; + sha512 = "4a948d44708a8913c1ab991fd60c245d8d2708ddd23bfca8fcf8439e2feb8c597298945964770a7dbdf183128b44a4820c2a15473250b6e31a20374b35f148dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bg/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/bg/firefox-78.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "4a8cc34e0a59d9000b62181461633863583c2f35e50dd7e2de8307b0d537e0f3b439112b2879a95c9a4341a01b361971f0160abd9409be1f4169cad44c3c3825"; + sha512 = "d0283703ee8b06db0e48af2155d6352b4fede42676511e47229ad452ce10ca2893babf3aa82258e434803615bff8822e8b5379a6f8fc756b873eaf4b9d7428ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/bn/firefox-78.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "8330315eb21da9da68840bfa64e8f4a150fd4df5e12d10ebd504f38dacab17cf43a246c10cd77ccb6fafbd8f4094d1f6ede53b623308fae90e161d4cf86e6fe6"; + sha512 = "9d0b8365651ec1b5e83defc18a3310fcf9b3b6d262850970500d73fdc226be22579302042e0f7095d041193c02e09160dd1c18f53e702ee24279d8fa9877579d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/br/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/br/firefox-78.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "cfd67e67af7d97f0bbae051b3c366fba48a09ec4615fa4ff178bc12610962952dd2584916df5a76e52a5f575fd4060e473ff4a2ccb63322f8cb8ed1a351b5a94"; + sha512 = "e0a576a6ab6227d38b2db3211990c02b56b695b138e66386a56fe7a923a679f5050478e043cfeb8de80e8e7f42379f03e2a08f3954d6f75453956918ac8602bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/bs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/bs/firefox-78.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "e4781c53f1eeae10b6af48c4841a2ecff7f82006ecdea50b3afd40d000af3d4d89806a5372feb13c5d44b04c0c7dca32a0ca6f2d9a138b393569a9f1d96d572c"; + sha512 = "f9fd7a505326a404acd15709317b0c18db49ee52ab38d3ab7912fb1a3642d6048a8c1384ffd642a72811362e7340728b98c2706c1e54e59c8e238d8dab19b2c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ca-valencia/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ca-valencia/firefox-78.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "9dc0395dd7f7e2c704a77deb4823882e1ea7c9ccc38bc49da4c906e70a009d912afb0cf05359d1f757b4591243091adc6890caaa85ee15cf1b2a26d2245cae58"; + sha512 = "89f6383f6f5d8c8d84fc2e95da88543eaec61a791aac15afe64fe742ef5996a47f9dce74bbaefb8b293f8cce3ccffa744ccf182bb3083d0eda2c6d3ab268d1b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ca/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ca/firefox-78.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "118980cb81ac4d84d456675db91d61ea54a35ad4796acc59434cfe294fd1e0355c1ee92a73de867b18ae04972a28d849d8ed4c8feb5dd6bacd1066175ae3968a"; + sha512 = "822bcc56277b75b5d329e3d5e58ecb6ca37ae95ccd6194efbd5d21494a7e87f84129aeebca8f3d01620abaa29bffedf85058e54b633c0dd513b51a7a6c93800a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cak/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/cak/firefox-78.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "47f85a0a6dd1c8540abdb017de664577d9ca79da8057c26b84045fb2ae1fa3b03dafb6c067c9bfe485e0d208d114449ac3cc02274ffef6e80affde8c2ec0c530"; + sha512 = "c317d87b9437b344a46426c46905eeacab73b450719bc14e3666d18b1fa3129457d6670082ccc0f215b0e7d559745a886f3de9991f1a53629af9b67db464a6af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/cs/firefox-78.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "0a51c2fbd9ea337487073b7c6e4fe616762019682b91cb9513f1a8a8436ec73f2c1175ee3fd66ce81084d0122f3f550fb49c5d91ac461bb6f2ac47d29dd69152"; + sha512 = "ef661f3251ff6dcea7138b1c014ffbdce61f9abc1116fc2a7bc226cf01369347b19eb949bdce3b0c78c476c81144c1f7ca8824c81df70282454818a97001ed52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/cy/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/cy/firefox-78.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "aa795f346fe87ac8afbca19add1bcf6aaacdf051323e4dbe8f04fa83c27444d9814cd4b7ae169390fbe3c3987deed14e453f45800393c64d896b8607af05b65b"; + sha512 = "df3341bf1815ad4e415d1fb57a638e2ef68c3dd2083fa504e1ee09276962aa26fd8de327f37c92270d2eb724a9870f527ff16fbad13bf8ea4b4ef0136f326220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/da/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/da/firefox-78.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "80796ffe89d9dd15b354015585dd722da3047db5b8b15fb380f7566fd99792959133a100bebe7d4b77ce5dfa710117fab61f5f5d0569eae88284138718e5fa63"; + sha512 = "bc8691f460b1074cbb5ffc3641d20d0678aac54421d82dc99f96cdf73f33089ad3ea388945a32b4dce76c2a6a1221b8278ba1ad545b95a08e53e012ff41f27cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/de/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/de/firefox-78.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "a75dea0908d83630e2df0991250102fc8d3148644005e70e31a15cc626d189735565e49021de9ed766419873adcded2086186a520b6edd8c8f753710381e55e6"; + sha512 = "aa2ab6372a1de1afd8d354e85047329c445ba47e0c7ecd91f8282b48e05cb074b9d024f0aee0738c9f3b3efba072fd40a7de6aad7d3b77235003f85824143637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/dsb/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/dsb/firefox-78.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "729e10b88c59a24b4d838b3888ed6ba910e28199211df046c1f09d68b19b5547e5e9953c131118fda4c302b23b09a5a8d6a78a6e220207701590d815af74097e"; + sha512 = "4a018ce1e2fe5124c72d8270acc97c465c88c5ce0606930cb12db7f36448c46bef17a6b1b118325278126b0553008276c4e21fe514f0eddb63d03fb52ef8688a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/el/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/el/firefox-78.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "862377ff91054392814f851da646f18a2e485753fce3338411fa590eb461100d94f5b9926fc97848e38d4d1715a8cbd82b87033575daf2e3cff00bddb5c7f165"; + sha512 = "1dc9c12e719030731ef2ec505ba7ff8b9d437ad7092509b2d8e6047d925430a96ddd80143fd5a6f10076ad0100583bfea8b28909db759bf01f381f73f25311a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-CA/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/en-CA/firefox-78.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "5a02d99dad00e69f47117f41a0b5f48b3a52d64b1595f9c8cc13086ed0db67c7f9debee30c071140d633821fd42f588430bd8ef93a16bb80f0def1f965da7135"; + sha512 = "618d1f675d80c155a5f250e6bd21b16293220b0b2db3c45d50769cbabdad5de13f5e28f5447b6533219a2a741193025e0592e6a78862c7604c469cf026f8486a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-GB/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/en-GB/firefox-78.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a8fefe63ff03015f945d45294d20954808488bbbb8f28629ac0bd2309500f64b6c766a1c75cc2b340f65bb511d1a50516097ac82d7bc2f3e7f82ae88789aeb91"; + sha512 = "a1aa32aee0084b9659378e4cc1ffb899edd3e46a8c040a6036bc63036441d9b2f47091a48aad119fa912e2ca06494beb2d67883270d87d41142f5e357a30fe00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/en-US/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/en-US/firefox-78.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "73df2d07120716b9e25028f8fc46c0e0e671b6ae1b131f9045049c709a1d678f9227d882ebe2f496cf0dfb71ae7bdab4185015728d1bd8e2b3661acf74ee1573"; + sha512 = "575ad9a880f68480d4b185f24a332f8243d6381d5bbcad66f91a80a313b88d4e0041af3dcff6ce93d7391c9f6021998151b6a2842d13a243e6d0b860d0590037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/eo/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/eo/firefox-78.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "835944b50e3005cfa69c8c0aa0644d76ad2f953d1b01be6d019423a276f8ba5abc39cad0393356029f5bfd4d2edf6b94c653a1590017eaa4cd206161e3513350"; + sha512 = "e89b6c12a8693682d0d7f1d748ef6b45677db13b4391fdab9f2c0c7e03cd3d569057c4d0131f79b0a17f4dbef288e9e69a3bbcab1bb15ec4305a5f3851896b48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-AR/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/es-AR/firefox-78.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "7395feba72406eb9888a59587674e1ad0041fb8339fef29f2bf136a7a7a54aeeb082e9be897b2137ee2f48bb09c844ed153213393d0492b05b93ec13fb9852cc"; + sha512 = "36de0a28f03ad285e8d9a071261edcfa19346716f131cd82b3b35bd672b766a1a31fd665555e60a84e7534adab8343d24cee78f1dcdd314eb540b8e22b639edf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-CL/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/es-CL/firefox-78.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "ec654f43750239ba622b8e0dffe99acc7bd04144f8a116ffe2f40b3995ca37abfd94b6827cf3af916d0657e38041b8ae3e86c6f5c0d215b24fcabbc97accf51d"; + sha512 = "4aca111e3a8b7da1ca828b3a8952f4864683606b622d83acc6be8c2775573ba41390f2c2f8d1de98b0378d12a38c11a5cf0b048cef5f2fffc4332d07634504dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-ES/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/es-ES/firefox-78.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "65ad0d7c4d9d0ca6501b7c957175661bf692ee388679c435471af6199d4ed0e070168490c4dcb65d53b66d8b517c5271019f869af7a5048be81259c3d73d01ea"; + sha512 = "52c17193bf79164be5466c8563f7d22e961e858a2ceac5229f234aa8613135cf025a80fec26c279857d94d5f6fca5d26d440265f76af20e181598895126b87b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/es-MX/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/es-MX/firefox-78.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "de8fd8cd130f6de8bd26ca054c8eb655de4c958d183cc05bcb41e64102697a4805abe706e760eaa32121e777f20170eaa48eb46db468a51c3c77fc74b4ca2626"; + sha512 = "744e556084ede6c9bdfadbb25c71d72d56ae92dfaeceb3e21139e02b5330fef6d6f732f88215cc08ef79aee48a1c7616b4d39cae6d3833560cfd61ca0fef061a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/et/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/et/firefox-78.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "d39f4f6a65ae24aac5d4c541246ca5911d6af14cb851eef3869e9481f52c9dc593f5518d1c475dfd3a7f2f55d661463e0d6510e0267f46795b3282a6a26684ae"; + sha512 = "2f9fe3fda93486e2142e27a1976b986f997b690b506aa82a9f75701dcaccb566ecc224d777915c32bfbe5c55d2b42f1e9a1e1768f4c8dbdf7616b43c5fadbaa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/eu/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/eu/firefox-78.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4661cf17da33ed88b8bb0ef8967809f0748c3cd1c8afaf22ba679aec95a9d0ee95cd5c1d08f7a449fafb55f49a32e2a4ef366d09056460985ee5b6999ae80181"; + sha512 = "a98f966a473029af2108631200ef08cd29b5b0f4abc391294a20b346d40c00794f0ca032c9103e888d7f38d08e25b8f8a57dcfcf713bb30d847262722871bd17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fa/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/fa/firefox-78.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "83181415420d2c8c5d56f81d40ad587c1ff1ccf21b1469a235efabad0960db78e912f459e7264f10cc9c2707fa3d6756b8c0b0f8321754e44ca5b319a952f9e2"; + sha512 = "2f3adb926df4c296b1b38ba53cd7880714e009c005f9627a164b1a59aef6f921994c398361845dea6d0f7591d55e542b06f4dc162ff1d66b4f04c4916efa9eab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ff/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ff/firefox-78.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7821df8329fa367002e526bc792432631e098b1ee15e116af2b0ca06d629594d650e8310e701d5e02711bc438c7be9aac997686ee314d226b834ae9ad661fbbc"; + sha512 = "e2692acc18dad0df35759ded9a37ad525a88b17c1471ef4ee1b5b550173736b57b1df525861a78861e824c9deb211c856e7e6d8f4adcff02ce8c9cf152ae8a0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fi/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/fi/firefox-78.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "9cb5b49cd326ba3f3effa2c844a9b2cec1f5e55a56f4e86514e6b8607dd8d3fdf88335614c974a8d2362f6967bca800032411e2d18a6ae5f1d44ea815baba134"; + sha512 = "67d710bbf74c9b51530f1146e0822c533e8847c73150305428ae4ba6f3f4529edc8b68fab15dd39037ba921a6821412dca6c4713a5566f6a6bed6a8e1e204fd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/fr/firefox-78.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "fcc80e9643c05ab9c581c9652bb24aa682b76c07702c3cc6bf4fb6abc3b5e198bba5691e0403cafacd1a52e45eeab707897603a24311a78a4b54da706208123b"; + sha512 = "b30b49577339e3ec52eaa4601c703baad0ea62b0698e67df328f6c1830acc03088a77ea34768624b4f352c2ff2a09dd219e3c676c0088c8a5345f61e7a94210b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/fy-NL/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/fy-NL/firefox-78.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "6df59da001300587d579b6202b85c089867b2b762ddb4705cd44927f16766e8c85d9c72fa00a5c47904b07e475f7ebf4f26428b9f4af73684a1b8140a8a6e7ba"; + sha512 = "fae9b6a80a49bdc5709dbcb3812ec13c758050f0cd17ac6e391fe0e1c3d5e0d2bc7e025b4303575351cb4c9fd1eb04d678569baab179486808082eeff03717b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ga-IE/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ga-IE/firefox-78.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "b94d32ed84c6c06a060040fa349f470886ce06a33139b987a04540fd567f74be779a63d7a8e860b22abb8711114cbd2c22b882bfaea4baba1eaa73d9a31670ba"; + sha512 = "6fa7670a546178126f87d8820f3afcf0d8b470c77a8f151382700025eaa4bb7ceca976037322e4dafd2aa27241ed0d7d0f066dacf742cbf301ab0f2f73b14cb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gd/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/gd/firefox-78.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4dfd64b333aac4848dcf3ff44b56d2070dcaa5b81150d643e50c68a1c1c32e533f6b00befef3daa1fa6f6bfa8041593acfbef4fbf91694c9cbea931b0082f890"; + sha512 = "26fca8fdca9927e8436e327b90a0d3453a518a7013830a3cadce33079cf805d8c5861d80f6bab078f39ddf0f80fca0a27be5fc981b0343c88b4f9849ac387ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/gl/firefox-78.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b4f10e6c26cf215b810512786988af3e961383d5c00e4d0c6ff2e0cf45d4616a3f999837df0b15c642109f0a930a543192d69b38fd5ac6d2adc4b8e147c85297"; + sha512 = "2749fce67388b56e2e705ff04b75e72408c05ea388c9ff082cc79094201a1ec5a869f2ea9f79b96dc90169f861221c210f43d51e7fa16e7ab532af4d0ee079b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/gn/firefox-78.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f51911301d88ca070defb75ff49bdc6d1ca5dc60534518febfad20f2aa256dc226f15945993300e96ff4fe1aadb427aa51340dc1f3ec7420c15432f57fa31d8f"; + sha512 = "08f9308f7f6ea1df67085a381b19bd614ed773afb5d038cb035c38c54d440c5bca01ba2b1573ea6ea89ea36e99eb326f2c313f1239026362826425c256bcfbf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/gu-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/gu-IN/firefox-78.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c122187243467d12422da400affa93fc62070801d30976fda1fde6664c5dbff3cab37c3b1e0a20a1b62605eb1127f13bdf806c07063cd84ee5f8fb9d19397573"; + sha512 = "4c54584913907e49558961af5abc0099a8afa9c53c65adbca4b963d37d6850e10139942ee3b18fd508256b4d49ea89bc3a9cb3375d3454154c82fb65bcb39ba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/he/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/he/firefox-78.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5f0208c47710d0bdde59742392c4086add04cce787cf257d9295243426cd3085b5693a382985a6a0b5cc46815049012807c6fdf5c4835fce8c0f60c105743020"; + sha512 = "658ed0ebcf81ed906ebe3ae5a056b544ba1a5caf95fc0d3387a84f439a493fe982095f0e5c683f7da989371f52e0917a7358a3c7d27f480f48d66c74a5deff04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hi-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hi-IN/firefox-78.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "28c296e2e3e6c17ddeb5bdff5b3c75e81eebe631c10bfe63a8b7755cbce78627634cdd300d8ca7e65bebab1ad3a058eed0be6704a1f3eb0c46761b2516e25a34"; + sha512 = "035a5a1d7104175985e05f93bb4899a78b988d8f229af35390d4ad53abf1b9fb71b7f1e32d1a5ab9396b067bbd79e2f3e2b095b65d0e23250a207c05d3e852d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hr/firefox-78.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "638cc3b5f2a1f5fb3e45e81beb209234a1a89356bdc99b933a7c7d84811691a33dca27163e93e9b77b2cd1168decac98d2c21a6837dee4335214f87e5f1cd78c"; + sha512 = "d1de8fe0b1765359281619ca251314369005d0769242be2edc77b5ac5e6535556157046c8de0ef58304ad49410b6cc2a249bd2b1c87165664bbafee43613ab9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hsb/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hsb/firefox-78.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "40e842a776c591dbe92ad2d191e6fd1c1c26c00aec6110b74e734ace0b5868afe430017ee2e953692fcbdb542115904229adb9294c64ffa63a15ae4da6abd949"; + sha512 = "4ca5fe030d6b584feb51a9e4fbe76ab1ab24ddeee621c143d9902c3307c61bbb6add38591c5caedfdbc40f437dd351ee4e7a7eb035e2d6c3cb93567cb017d58c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hu/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hu/firefox-78.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "b544898a2433c66c6b69fa84e36558f95d722e986d09afeb76f412c128a351977389bf554d524e28c02d8e5554519ebcdc136d57f17b0baaf40f78f0738c9aa9"; + sha512 = "929a4647c59a11c5daf7afe27360c784c50015ad674819629eba2f148e5d06fa963c8b7b2650b6cdbe024c5147cfd8a9d83f5ae65e4d8c9d67a7c222b8598763"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/hy-AM/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/hy-AM/firefox-78.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1a3a40148fb35f3d741f732e3a39e6f1662e6196b1d0ab149b0f42f2f7dfc103fa51df0dfe1874a5d483a5a998555d858be06f8afce9815f7242b7b86d8b3af6"; + sha512 = "ec3c42e4c9b43dfef6d8d911d8b38ec843b148325a493f2ae6c72071e5e351a6e246b6453a463a225eafdaacfb112e439a66f2e7cd63f42f968fd2d56c034888"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ia/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ia/firefox-78.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "7e8472462754b358a4ed7f7d9a1d853d0f590a680a64e985ff1db631e84e6200908348d85ae3757b9236c76e9b3e302f18bba3a84b620834345142e3e39f95ec"; + sha512 = "c161f0e27942e8223597308c61eb2f4cc4e7c75cb3fec5e3780827a267ea414ae5ec1271f546c4b0df35fd40acde2e35892159c78a66adc430409510f925f3c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/id/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/id/firefox-78.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "028df055359a2fc5088b65ee1f377b94dd69f7c6c718cc954084ef5a53e3f53ddb95a8e52c46b2e463e5de6ecd7272a4d687e49718ad96ac17579ad121403bc5"; + sha512 = "e388f0fd168fd22a0061c9de38907fb64dd6b3d0b9170b4c5bae537e39ac400501cf0dd94f4d7af56ba392de71dc01d3b8fa02733db5e414d769afa1cf87ab2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/is/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/is/firefox-78.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "232ed8f86d6c825444a0e2448b5d5f06a8d17be5c4ce35fc0d6cff24cf3e49253ab92c16d82ff52726540104106c242e3bfd0b3b969f8a437f46b60114654f42"; + sha512 = "f2a94d74e0cf9373e9e9a80fcdb4f7b54e7b60b83adb19c133e68ac97a34e3861e9384af89da89c668493a96a6bf189342b4f3fe8d48def3ae32d16d7cf3e3f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/it/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/it/firefox-78.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "43f29ac4beb67d8859cc8cd7abdb3ffe2e3c3aec7c962e4e9481d89005a72598571a0dd53a65b06241ed04e6022b7992b2a2c4cb95bbaac95c4132e1bde4869e"; + sha512 = "1c67c8982e6e53a4881d2a5f11e50079bdeed8a812e0832f2c909ba2c99aacd174bc3df2251f8f545ca0df7aa2efcb2fab93b4e189114bcae62c9f713c5b53ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ja/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ja/firefox-78.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "c469704306f8e28f8508b66bc418a867b3f39eb33405430c0b3fce3f5ff5cf0390d03889ab1c20aa52d5f0b7f4631cb98e0315ab63c3e9412f30f484ac88df5d"; + sha512 = "19d152097f016fd21eff6aba409f3d60d1cc54ac62cff294386cca0df780a53c507e1734089e58ad8ef8ba04a92458754d7062a3508e2bc506cd029b8dcc1c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ka/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ka/firefox-78.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5c4eb2a1f8167ab3f6e818291595a67b3b9f125f800ca84b930e0ffe64357e37b9a9999efc17593e502abd1912498250423fd672c7c479d227dd7d6df3092c49"; + sha512 = "e2b5c57b222216f19ee62feabad0421f6afe40ad7b88359037fd068bb1c24c9c728f84a3b3213aa43a3f5f1ec4168979aef38dbe7228f0d809a48b3c75ad6f92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kab/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/kab/firefox-78.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d7b7eb5065a6d949b018d0b1bd7c3613a97311168783a64597731da0b7bd248f11b13069833f3fc794563b1de1f4e0c40be23231b33471dc49bbe112f8e536e2"; + sha512 = "c5b8159a3b4c24cf739ce4084017281ef8fa133ad5b599205a392b4ac52f8015860d08c206ab37bbf5d5b4534f786ebe530b6bcde962dc2b783e3154f3ba8cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/kk/firefox-78.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7c2a20a0e20bf581aa8ebcea29ce7096fe14c8181780364ca6c828e0df71862b4da85e46ad5e9b73c6fb1dd575732ad1bf36e7dd9f6087f187cd56e29861aa4b"; + sha512 = "ef54b2da6c0197cb4f85731cc441bf99e0576c5c688cc875ba52a6b985656d509a6784a4e6608b77be1d5031718cb07091c2f0371cf953be93ca92810f600319"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/km/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/km/firefox-78.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "47ce70d662ad99540a0186f62c51918e1728976467f612cba3fc36b9d336b1435db1c06a834bec54e1546b9842028c03fc965efc472a08db81a6c13766db48bd"; + sha512 = "3866fdbf865b42a27606ad9e1c84a75615309a0bf06f0e72689916269efda2c6a6659ecc70dba496f76eb5f4415d556f37e4c94aedfe4124c7da4e6bc1991de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/kn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/kn/firefox-78.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "3a62cacb7f5e3b4d2652731268fb0517678ed38508f5fa0fc2fc5288031c706ef95a2ebc09116b35a1587e4b42fb8e9b07667ec90f3727be0541d398acc1e8eb"; + sha512 = "418376db9b6fc67e479bfc18170a96b0c1b23b05727760d2d10f4e6eab553f7b3b5f68a4697ef5bbb977ce78362ddc66a2fd7d6a539098fd30494a9d91a11f76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ko/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ko/firefox-78.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "9fe53ec1bb0e5b2ab583c2f7709101ef6ad8f7a246ed0ce9988dbd086640cf34321b49b753960eda5b47a09fc162b0a2a2eb103287e208f75a85c97ad7752545"; + sha512 = "34389c964d786f81b8832881c3367ae4de66afa982467bd09a5492540aeea4b0db691b2cb20e0b0030eb871de31991e884d4aa98844b4855c6be34470d1fcaf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lij/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/lij/firefox-78.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "221ca319327c9bc4f68f12f93309612ab7b286f3df0971dba3f42d6e0ffaf12bb554cd0dca83a4bb9de4c9a239af724eaf5f70d0f0b594593b64f8338b4c7954"; + sha512 = "8e3b30f3b844e2cf3596b3d582435078a8d81cb42b0b05602038a017f7dac907a172a9660f1f37b977dc1fc95e51d21c0f71535c298df7a8a073763d79d427d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lt/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/lt/firefox-78.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2aff555428cc9b04ed2134178e8c2da1ac702f1a77b3f5b648cad9bb4c59875277830ba657aaa7dff7652a4fc35fb39b6dbfce3013213a503cc39700156193bd"; + sha512 = "9f06455338b565d112a376e6b5577d8fd5ea3690f20a481232fcc21172f87fedc01c6e04102ba97ac8074abdd314043da9fb313f367dca7c53ffb38e8ec55aa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/lv/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/lv/firefox-78.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "540057409baa8b823ba2eb2ee1a823e24ff08510637caed97635d719c1e3be6fa12379f86f08a68e53c9084ea1d79bb89d188bb3520c723c52db2fef3ee8025b"; + sha512 = "4d81635af9f6d08d91a2cf7123b5aff996ee592308ff5754380998ec0592d058055050156a70e47ee29e32a5a1b4b17512656ffe19b9e551c547c186bab42087"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/mk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/mk/firefox-78.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "adde84f336cc36f23daf58b006a0cfef18acaade8892c2368b0a3b3322ddf2b26a0783f04a533e173d71a4e2f579fde2f6fa6a6c23d80506a1dfe1945a2fb073"; + sha512 = "920d16c4cb05c821d690c50a552c2a3c80cb1afe70a58aa4bbc6230701a5858641c25a9d41b0ce3ab3eb2312104a8a70249316bb46bcaff6ebc46cafef8e8e10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/mr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/mr/firefox-78.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "93b021845b9dcf173b4fef281dd4f51ae5a84de3bdf80c3861fd0e5e4d9431366b4592f0bd553d45fd2f9f3cf690ff82cfef6b32f9bab06fa916b417658402cf"; + sha512 = "ff9e640206fda93d09daf08a74e31203e6a660aab7a62c0395f293011d81eff7ec8122192690c0e663647765f843b582e15676c6141d732a0a987c360d269035"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ms/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ms/firefox-78.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "071217dc5109570a1f5a98a06ebc0120aa809a189b3a78a3cc19dbdce0ad1cae409f665eaf97cdc7b4df529c8406fa2fa2c57e5b34dc32e3a0f4a62d981aa2f7"; + sha512 = "18105aef3e2734b36462ab6bafbd18788e6ebcf9681762abb32ebfc57c1ef3b9379ae2b30d526774191d878a8b8af02310e2993c2eef54869611dfaa45814b5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/my/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/my/firefox-78.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "39fa770a4b6632d1dc0e3bee24ff7ed95caa26db7298c93a7e0f4732ef18d72a1f21612275908dd12ee94da0a89b08e2b575cb745340ef0d595263f554fc61b1"; + sha512 = "0568c7d5cfae6164296ced6b2522831d2ad3b8faca5b955f78de830e49cd7428eaf0f93a12e8b664bacdb1bb90bb5fc65c4d2a1566ebd3e13d3f2cc2ed83e80d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nb-NO/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/nb-NO/firefox-78.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "f408f1ffa88b3c918e52c001ee95027730e4961e13a0b47a0c8c6d3c39aa8d7cab172329738ec546207051bc1d682b8d62d59ee9efae4d7533036cc9a6869f71"; + sha512 = "52eb5928c39fe71eb47a3d81ebb6589a8d68612f85f250fcc744f473ba0c06eda5722a066c21720f42ff4592bc996d3d37e4b824a753b8797a8c11785f2d0406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ne-NP/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ne-NP/firefox-78.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "6b8bda91d969a832ffbadd4d2241b9bb572637d0d34c910f7e5f14921d7c9f76b4a88e0e3bdbfa259a0090cc8b7cbe638f60596f05d8b8c5f48faa181393a37e"; + sha512 = "c4dead373d6d240fb481f768910c5a837a41bae657311ff2b9f9b7a9ee0f090e7fed76213d6a4f5d27e9b380d32ca44b8b8e08ea6e401a6bffd862fc57fb83a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/nl/firefox-78.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ea86fff04dfa7cdb8344af38b5b983dc9043b5b754999ac4b2ee1fef19df31fb4c43be6952e0e97ecd4af62c97b1a8c12914f0473dcb19d1a9fdcce4c0710869"; + sha512 = "3e1c448e7419f8919f9524e8bc762790cc79a6784cac54d0bde170238d79a2f3e00b88d29e1cab6013b57b1091579d36f113c08ef7071ad5289942ff58a79bf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/nn-NO/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/nn-NO/firefox-78.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9bb74a166716654e32f1b2931241dc556d399148bac3b1fc44a96a101f48e74413d40f380f6e469639c186a2483bd9131ee27b8acd8e442e4a3c2eec7361bf1e"; + sha512 = "0c730d0734614c97ce7ff98ded19798852f17747120619ec2b992c1bf68e5427495075ea126f5cef737fdf266a3975dfb4052903913a326a91729184595c79a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/oc/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/oc/firefox-78.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "3d7445cf18226db6a4a875f2f006150d709b53a8837f4dbb2bfc7782149c01949473a1fa7ac0d5ab3ce269b2a41077cc93f7635b3b55a08c2a105973c926e62b"; + sha512 = "e69ffdba4624194ea9085f755d718e75094a65e04128c1f51ab71de7e79e33462cd4683c8f7e5e5e734dcabf0959a5f01a0e4a72694745fd79c1a66b034ee502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pa-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/pa-IN/firefox-78.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "0208389b74ca0070c727f6fde7102e12e28b460eaa062839c23a81f5f25f68ebf4596e5dfa661a2de7c21c233e09d621dca716233c6b73368c7eb7fb0aed6d93"; + sha512 = "bef28a4dc75532ca4007632fa50826107f63807901bf163fcffcee048728a377518ff496f15cd9090c555b21c8b04fb03f78bfd4b9609f7b95ff98e571dcc576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/pl/firefox-78.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "9765be62795d6a0efdac06a91d2993a1da2b015ea20679aca8ea6d70768b2a0f9603533d2ab81bd2cf33dafe842e9c78d0a0bdf2b705c74f22b7d9fc22cf2c32"; + sha512 = "961c13384d2419e571547b312d9f4b349df804283bb8af47bc5e81305606ab514e944efe0a1dec5734f0dcfe11cdb9aabc3b4c1bff6c3c18d218106e314e0898"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pt-BR/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/pt-BR/firefox-78.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "c59eb5f10a8f94e44f785bdb8425e8b889e0120434c1796def1fb521a77d5da356176d1c864a2fdef08cb650a1b6c71cd334a3cd0d1b2f647519d46d2d65ef8c"; + sha512 = "749da63d7a39aa571dbfa3cdc61393fdabaa92cd4e3965c5a40c072f0da431981c046766ab1a64d18dff00e627db26ec21421e386cade84589889a970e420a52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/pt-PT/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/pt-PT/firefox-78.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8fa1dd31772b0de062c1621ef9346ee1b0fa77629977c39a8111f0f22b00a1656e6bf143c3ac74af7abeb8f2c2cd26495327ec72b067c4ab7743957248b62e32"; + sha512 = "445e43f228cae85e4bbc777032d1530d20694c779ed58456712efbd99a5312b27de23db598c3d963c9ef3c82ebc01f12a667125aa8b6acce528b9e9f6aef4571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/rm/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/rm/firefox-78.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "737c5614d84fd72313c3ee4eb72779bbb339a40f249967417d591137e19d76b32e9ce528adb167415134ec75b796f7ee4dfa624cdefa4bd42e11148297b08867"; + sha512 = "bb04bd0d5c062225aba838824d66b9ac42fd6991c04f1b7a64a5373fb7a4e36c6ef6d4615014141d252288cb2a5af877c2e7fc6addcaea11919e0216def4b02c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ro/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ro/firefox-78.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0744ff66859699c611597113c77de6bdfb5ddb543768671a48f9cb83da888ea88ed6fbde5fb86f610a35fb6e7daaf0a4c6fec1d9658c700c16f37e04f7b41366"; + sha512 = "301ed2ff68efd6b58aea68b4c18c89e1bf9c2092e56d18201d9fa9f1bcf0c81bed5a54a682ba9654269dc3edf8906b444ae13cfb8b396743521dd45499a568ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ru/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ru/firefox-78.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "77e085bcbbb2ee78c486f85d86a5be43498ea094214fa1e769c3edf7af42821c833d6dd207766ad1fea9eb9ad2354229617b6ee49b38d869024092d317790781"; + sha512 = "0de28f427eabf2c6baa531e37d5d3dacdb193f63ab4f76f1aacea3ac0f228e77e097bdd4a090a2516cc52007403ebaa19900fd20235d5436a73a90893dba1e3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/si/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/si/firefox-78.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "1742142be1d9fdcb13f6d68c5fe413b9ad019556491263855c172d350fe0bd00d467bd91683caae51eee3e512023e309ad97319e3327098ee47ab6be35d1a851"; + sha512 = "70d2c5ccbcac516f7c88e064f8fe996daabbe9e31e2c073ddc527aba5ae29c7114947f0c022231ad3add80cdbb2a40f6a8d78b2707ee92c3891d0a9025d2ba54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sk/firefox-78.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2c292ca74a5424315e22d595a688d14167389cd7afbf73e07342b7e77ca32e9b56300594790f26d048b32d0ec014d23f144b9226b01cdeea3233050998394f99"; + sha512 = "ddf6aa8ced841054d931129bdf9e6b9bffd5ca02a0bc61b12a5e88834e8c314b4ea869e6713cc476c6900e00aa521cf4d1b40dd388d2d754c63f18a01ab60c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sl/firefox-78.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d6dad078272c4afd6d0641bd53db9d9af4b9ff9ec34c45917ad313cd6088ccfdce614669765281d57c57dd83a5b7e428514e21c6fa13cea70c93e91690ece671"; + sha512 = "73ee6ae45da91bf901f19bf1d03b523d79b1341deade05c52faccfa1d7bf1611058104a69cfb40896d50f33a01f6ae1172d8e59fab77e9d9767355b5ff7a30e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/son/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/son/firefox-78.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7a382d02653006c00e4761a7f61746f6ee80ae2f922cb2eb027da3ec7f6cebfccacbd51c528a29186557dd9e905a744e6db7e07c273751a1f80a277a08a86410"; + sha512 = "39f1b59caf9b4fb0a349cb890aa6ec598753907aae934abe1ace3845f50a996d03bc3b55fffb56b87cdb43ae0c8e7f521c9ec184049fbb8f82828947b6c777cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sq/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sq/firefox-78.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0ee0ed873edeae765b624e1f76612b06bd6bc7b8df396656c76b59b1e1ef8d5b7f056a18a71eb2cf9f950382ca272bb9517ce24c6145e966f6e895b4ad843e6b"; + sha512 = "cfb8dde4ee081d3f20bfcbf28dfc6cfa42d15366313af95e393a496a619a4ef2f929fd4abcc1939dde64f3816a822ab64bac49cfe6b3f6f1127ce2f81d791060"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sr/firefox-78.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "d8589397053bd3b5068885925ad69ccbece3b439ee61b787babce92f24a8cec9e32164616d73fbd35f34047d1f5ebee48e91bd9f1ddedda2dc4f19d5ba869afd"; + sha512 = "0e1830128bf23801dfb6c02c2b5f8128c47a320ab251889ba20e9e4fc1b098d0fd1d8bb7f3268b205eb86e570526f0c62b36f411efe8d2bd936ad0d6a08b97c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/sv-SE/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/sv-SE/firefox-78.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d72111d03ddd880a24590a5b1e17e950401fe9d61fafc7b4b256f877d8c950689ca393ef6fdae048566beb1aa46ccebc7f1de8273c22b8a02a651730a75e29b9"; + sha512 = "f1d22cbeddfee1212e7566a7fa1864aa8fefbf015b59d7a875dec84577558a120024104ee377b4ad14094a2edf5faed8a6667f575e2c83ff704cc97fd10ff72f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ta/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ta/firefox-78.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8b3c549bd419861fbf8d3dd30e10482922af955454bc1974f0c9bbe065a6aa88aa55b8808b2c4865ea3bb5ec240490b882a3d1251291513b234cee3c075f28c6"; + sha512 = "294ee5683589fadc76523c556070e32aa06223b3f591c01d6a586f0844325f246db151e01192e81bcf21d6e1b790c9497c46af08bd6168c417d8cd9352a3c6dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/te/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/te/firefox-78.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "8d8c74aa0811c24d97ce03628d9fa3be139ae53356296d8599c5c4a9269f479a2dd720dace92e86560a3986fe68daf042b18e2bf1c4d4339033b5c42cbca0f26"; + sha512 = "3fc115822fdb9129b841b2a851f62df5997beb6191d95d85ea1ec363c1ce7992334f1a48557a90d1ea56e473922be00163c75635871ba39b8628aef074c9ed0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/th/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/th/firefox-78.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "7c6645a2287b0da7c346f1075e44658c72d9c95e4e47413d0e18024691471e0165f2ca58142658e4ecc605fa5398d047e9acd248e1090231809887189ab19926"; + sha512 = "93ffc698a80c20ad58db52ec56a4d25448b172618b80436ca62356db8509c4d93afbe3bdda4b1dfd3a38c49847a9b5eedfa3393365fbf7217312890d571bb55d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/tl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/tl/firefox-78.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "d27d4f5815ebf6d92c9394fb9b187985eee43b89034f6378a862c5e0099156423d925e4f239da7f4dadde31a68053eef909d53814a2342157f42a1ffaef48df1"; + sha512 = "27f440f611162988f1686f4a1cc4902cf104a1efade3a698397ad0b4312c0984f2d1d3c759d0a94aa099ac782bd1914265ed4e8a0dd20f4b076e05b681f5399a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/tr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/tr/firefox-78.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "e9001e4ac3d56a76955c04f2cc43915696e3ecf0ed0d7446a282bae6bd3ff7461ee6abfe7db40ad61cfe37361636089f2d4b353eb5f7f09a9af16f933c9e1ea5"; + sha512 = "eeb122a4082823e1075d92e5e096f2bdea1f16ed9c8a944694ee06e394156822bbd33c7af81f956edcc4010f620997af7361d5f9182cf4b1e8e21aa7415aed18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/trs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/trs/firefox-78.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "9aa5a64c8ab17beccaa53cda383383b28b7ba311c08c21dc9bc097d2e43f351901399f315f2b12fddfcf101023212e61c5e416442a726a324c66c7872dea75af"; + sha512 = "9d1fba7a1b9ddc18cbe8be6dc9eced593cc8ae7e97cb7db5a6cca59965a88b572d47701e20b0ec99f2e0784ead8cc03b6913098c00f61bcf80c95c787a959712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/uk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/uk/firefox-78.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "8d33e4ff58711e2bd71144b00a96fde332675c6a81b09c1896eea25b6599fa37358c762d951e4515ed398f746b368216fe26beafdcea51cd3e927e132d26856f"; + sha512 = "0e3ab01314523d936ac055a197919794cae269e5244f93a9df11a7b7ebc922a2b075aeb928316c82007d7af5616371c8b42671bad6ca7e3be1a78ecaf844175b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/ur/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/ur/firefox-78.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2f8e5d91c9f4119340762efe519b11eb69c4dca355a4add963cf71a5aa58b53c315c0315caab323b27cca293f383bc07325dcbc483326dadf95f305fb2ecd067"; + sha512 = "9768fa01a377b7c9c2417d91cbbac68031606f55ae01106de3df4c43ffcfef7ed8632be95e666f67c3a6c0941d9ed0b1fb00703b519bf906ecafef1c9843bf6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/uz/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/uz/firefox-78.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "b23309f728ccd814f7444c1e3e129034c66a1ad1fd216e6960c79470fe37d765314fbe9d221d8bf2f423ec07406657135029b280e2d5884c5f3a55050e0194f7"; + sha512 = "19f4cd13217a8abaa447c1157413564ca2594cdc02da49496af884530c2652acb62bcdaab218c140e9d067052e5f33d05b5b1d897ca72ace0acaa202afc45a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/vi/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/vi/firefox-78.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "698f917a168d753d7dea3f0e91566beb6cd96cb708abebfeda808115775ee5ee2dd906ed68f99cc571c752560d765dbb49ddf701de4f74df2ddc8a6642f9bb19"; + sha512 = "e29103dc7de0de15ba5e90a1e47eb1154b1bf55889654afdb8923985b0be35fd5c5c66e5f3228acbddc99a17e43e2dba6aa62e695037687b9bee728b63cda38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/xh/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/xh/firefox-78.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "1b1dc73a235218bdb832bde08f4de5f157fd9acc2257fbee5f1684e2d4bc2f14a22ab70e062d53612b36588dc3f252a6a1e6707cbff392d9d1b1365adfecb13e"; + sha512 = "06e57712ae710266672aba578666e0b258e23c29d6a38ea3b642af01a7f82cd41719eef3e3296f9e9e2092b3a34deb317f933b63b48419fdbe654a4f7f1554d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/zh-CN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/zh-CN/firefox-78.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "07d21c46ff1cad5cc9e75d6719224721e230895bde0adc34b69eb5a34f14d400206e0d2e4de80ba4e029de0b185b2c6ae0a44624b5838eee210726831ad082f6"; + sha512 = "7c1bbc3c0623790cbbbcbefd8f86f2bea918d1ed4bb72e8e9b6902a01a3c2459c07223ac5b4a04443e41693d1e50d771835fca2db5772cc6bc7134e06d306be1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-x86_64/zh-TW/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-x86_64/zh-TW/firefox-78.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "13be3323975a7ed42f6a9ccb8bea4b71d875cd5dd8e1e5bbef8ed36d1020819f3189b6e933200ce58793bf89cd7d989e6e22dda60321c9ea3c5d3b776cdf8e5b"; + sha512 = "487ee80d785b0b1a3ebf583191f6840ccdecaa868ceb139d8e2a318e7d113fc27d692df4aa877924f60ce81207f8186c5c2e7634b0ecee252dbad3f5cbce3139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ach/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ach/firefox-78.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "383146225929a318a6dbe25e74880f7c8b630bedf4ee91adfda3b8c9626b2967d6e6e76573e05fec2a4efeefd0573c6ba63ab252acc453b691cca3f09dac7f1b"; + sha512 = "e99b0b7e69aa1023db7e57f21f30921313eef6f591e74eec9fa324cd575332d2391743a723993ba9d783c6a6ecea274fd8d48dc8875ce258e18359fa96833fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/af/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/af/firefox-78.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4b0fdbdddd7c5eb18a25dfa03a95580826c940941f66c984a9d6e46f1ec88ab932b0db8d94644310dc5fa1519d44a3cbc24d8373a449b6987e2401b9bc2800c2"; + sha512 = "9651404f703b153cc44af146de732231d73fe2b3976d5620c197a6273137a246f3c46444e1a40023d50e4f56c66aa2de95f1762a65a98a89d54fe589c1577c08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/an/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/an/firefox-78.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "72495918ee96313318db942c8c403286ff6ccbeb59811ab2c595723cd18c2a57d6a42adea7d8779b22b9dfdd1e5c5c0e19b5fb438d198f9e770f3034a932e610"; + sha512 = "11f6023da98ccfd4762b8851f303b0e26ee0adf55d54eb8a116c0d078f30bb9a663c339f584bd7bee6cdd73b83d992ba2df36c1797d0973a65469f48386f562a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ar/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ar/firefox-78.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "61117afc0748e44daf713234b91911336875b8d9eaaeecf8e183d54d2c6bbabebd1cbf34c74a019ab660b06bfaa28c417d7ea3ae8cc476c26c9c40bb9fff5392"; + sha512 = "c19e5f1615e40345e62d0bfb18fcb25b71f29ee6fdbd9da20ae6faf9d585f1c5ca53897393b15b911e0379ac36a5c1f1a885bfa10c6ea79f0d3129a2c0176105"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ast/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ast/firefox-78.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "63f66ac824c1ace695000cebd357684d0b09c3e69f46021f44ffb2201327468c2d4d21597a660cb14f6fd08c21d58e0e47520f72595da8f59c808459ae8ef0e6"; + sha512 = "bb9bcb2a81e0a574c8e85c48a4177c10f0331a26e2b18c5ec74b8efe43d0b2128ba385a388ad72165fa6b1e96587a1544a7703ef5224a33948e663fc02dd6eae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/az/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/az/firefox-78.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "481f350c51b234aa44091e7e6ba308364c84ef988bc11c0f66aac72511e0aaed0c0a4bd865e781516cad6a867bcb2e09fd4d1726871290f828837398712ca401"; + sha512 = "b0e833c99286643a88a06b68af74e34724ebd2ef98aea5f138ef33e1f35b411bec482d52884ec1ad7d61d73ae2e52bc0510998bc9c8fe9ef8bd4887e7969dc30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/be/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/be/firefox-78.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1c4b35ac02bec3daf9f5a7fd984071beb274281ccc3f3a8979d8255709fa22396a1d2ab2606521f279943c872294e19b99e974b116f1293d63d10dae0f92e586"; + sha512 = "af4ae6dbaaadf22ed0d7743185f4e2c89201014665ab3d606d60cc4c86ada14135ac5816497ccd022bbc346218a452b614f25d32bb0b8e42fdca3ae261631351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bg/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/bg/firefox-78.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9bf06f95a1769a9f0a4e63ddc15f612d8f5f8678ac217671c58f3fe8669d3936186a2695b6b49ab6d37a052a2844ac53e6d65795f4539033467f2405930e191f"; + sha512 = "c9854d8402af75a174e8478713f715d39e888c8354d27bbf17161b2629834e24c0b89b182477946e736002481dea3e7a9887b1e2efbbbb47e940b4089b19a970"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/bn/firefox-78.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "7388dbc16b05f32a0c2cb69489e8dc5054c6ae785881b91571d2ef7bd010300efffcf322598c51157f681ba599f7f39791bd2dae217147eeb478be92efc82f7a"; + sha512 = "efee82a7c08bc0681e29b1604ed683894dd8ee70be22bcc00ed3dfb5e8af6b6739bddeddaf9850900e602935422e0f5c833e1256c78b2367c07f311e86ced69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/br/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/br/firefox-78.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "ca7fd9c0c46c92b26e1038a4b611f26690b4385cadae2651611f079323a6775f47d305d9547d98711eeebcc00374df5172fddafaacf44279cbe0c765c7fe011f"; + sha512 = "1ba23efefe314bf53b9b0979eae103193152d8e7bf623f2c3ec5ff450de38f52d59f64b85d8816647845710b51e9e9bdbb9e17c36cee78d718b646903fe97d34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/bs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/bs/firefox-78.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "fcd846854ff686542a0159e722722a97b6be0a797341bbfb2fac62cd8b6bdcaa3aa2f51bbd6a7b2d90b46188af1ebc5c1b6ae6e6dc24f3f4f1a1bb26cf2205e9"; + sha512 = "bcd509bf0f893d37e83e2b3cc80d64a8c53919cbb043f480af3e57829b6537d208d0870a72509f2391ebfa5446a7be93136b34f9b2090a72b0191ce0b3918baa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ca-valencia/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ca-valencia/firefox-78.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "4e997173753a7eda937c5c04c1bfed27a2368e58db459d1e0918642d2c5878a5abf5437f96de9e47e0322f4f0d0e8782cda27bd24f6c5efecf685fdab3b9d149"; + sha512 = "cb1b88aa61a2ae6786f4300b5ec7f35b01120da9d0c5bc5fe4b273820f1bab53949acd65e6acd5db421bb7e6d5cb99c02a2986592d45307a6e57121e85cc2657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ca/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ca/firefox-78.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "c2ba20e8217134b641d9c97e3332167236549e027946d7cd4200ace74498639e6841eae76f753195ba8ffd2872dc3dc81576970a128cc618c51526497d14c1ba"; + sha512 = "88b115ecab3e4b34ba105d5227ac48c10824c76f20a5f8dba63cb2850fb2c2c7f85a0e1cd5cbc8bcc368cc371007a094b03d81a880f47fe0211171a381f53b15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cak/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/cak/firefox-78.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e89879635fcda716916f5e0afe2372172a7e3e13db6a57310cc2d4e8bed95ebc76fd2a39d730ba548a8f2871e68ec6c80364a67a8a9f2f72e8770a6088cd489b"; + sha512 = "90b986f41f5ba63fda27084be05684baba11a4ca22fa9fec1177c4c90bfe36f0e3001c1169361b36de313cdf9d3a99902fc509f6515c24f08702df5617faabd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/cs/firefox-78.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ce657c44e1ae63db3f206601b5be7107e0334de7be574c8ff9211fabb6d41936eca3aca33f58e05220adf1213aa96ccd20f183a72c4bfd7cd71c145e8e8c051d"; + sha512 = "ab8ea7e7fcac7687f93dff99670273c9c52a4b6d0945a60829fb2d0859e982df40bc2ddddd93a0f0048695d455ef8f30e9561826231880de19c5710800eec852"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/cy/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/cy/firefox-78.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "fa217e8a7dcf509132c35775c85c74eba600dbbbf2952a00a61bdf258396f134759667f6c3b8195bcc0fce8a6d896e70fcbfe514bb50346969fec258a8ce9342"; + sha512 = "34ecb5f957fe88be8bbda757b98ca18739c38f1f84f4dc65dec6dd4e185a10922760049da3de020f07de9542976cf2b48bb90076cbe235071a7e99bb674670c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/da/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/da/firefox-78.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ace0ea8fdcc68845f948656c31e142d5158eb2ebd0ead6c8d1752d6ffd4ad6d915b632034ac328751e69fe133d288309b2db0e97caa8cfcbf697150abc757839"; + sha512 = "24272dcfc6f6ca922f4d19b7f277713516d36ee9404336baeb8ea0956cb1330aa9bab93ba9296312f6a3f302a8855f2e1cc28f33529927c85f26ae190a70a9a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/de/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/de/firefox-78.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6e87302f9a5c9a08c7e9c56257a31787c013ce8b5b800d4a7be1cb7ebc66c32d9cee536312ba0042638c33b614fcee051f99b83b71007cb21716e0d12d380696"; + sha512 = "bb02945539fb419ac5fd9c090b2df6114af917c267a33a16b435ba95cb2e5d1849939707985824ba201560d1ff67f11a419587d28aaeb699eeb15fccac678a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/dsb/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/dsb/firefox-78.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5f09de6e10b863e06699b9131c5bb819aae6afb40030550a1e2785555588fee83e18abf60825b27f8e458dc9459ed101db213c230a06507e95e9b43a0fb1fd58"; + sha512 = "ac1e8b9f315f76eede59e212cd71d7af5c12b97747e362d968ff26c6184e5a232a3ea0a0248f5c0a7cf4cf3fe3ec2bdf1f3dce5cdc0b57b28f7459ed1c0d0b6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/el/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/el/firefox-78.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "03dc3e0ee03c27653c42f314a3e65d9e45b717803a869827cedc5ed5351ef32dcc768f7c13a9cd3eb14b0ac8a0d386a8392e677f7481bf81699d4cd22f91cc3e"; + sha512 = "41e223ed3b348107cb0d4b283eb3e271f11ba4cca843ef3ff059263040879be58cc36d86449d305c327b69148c4ebc24294695b2fe75634124fcc8af04024860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-CA/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/en-CA/firefox-78.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "9eefc744bbfd503e6cb0cc0c25a1955a3246775ad2f204b7004aef96f24e6268576b89a83853de93998c228208174cab91cc0615ca16d42c6f2dc043939aa213"; + sha512 = "850b10f65d29d351f24a82d35c9ba631931af262e039cb6a2aa08498d4af99a1791bfe1da6de50fc4713c3450d346a54af4dfbd0adbbbfc8450b14ae075545a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-GB/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/en-GB/firefox-78.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "66e3abfa4acd7b701285a8bf9a48f6be2401e8bafe19c694f1307b7b3437efdf500e12ceaeb5b41f3deaab29a3ac90b78ff79fd5521e94bae055b119d4918690"; + sha512 = "34e6c313307a750f92c4f7e02b5b9210a5999154e701376b63d34866262b43b5b054d376bc7cd8b256925f895604acd5b664d7d198593e181f4fde21a97621e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/en-US/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/en-US/firefox-78.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "38500788aeaa19cc295c038e85ab11ed7a091fd5b4105cc2b7202b22e271dd8f3ca8139586e87273f98b1e17b6a7f526131ded5e4bddd0c4e52896cb7f47c5c5"; + sha512 = "3c6cc88bbad795f2c7f1db75b045ae14f062d28ed11c594d22c68189df3a4213b5b56d441ccbd032cf61c69102ffcd43c86a97fe34e5a0565da25471eb53c646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/eo/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/eo/firefox-78.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "d3e5aad8cbf2b2a61cf52d3f17d99d050ee46567a7aefb04d0855922f86e7820d11c15d60efe6beea76232a7d1f43f2b5a4aca088844906affdb2d272364a492"; + sha512 = "f2b287e831c21f3b5d8c78e0d73fbe2ee832326a5ea656f9ea7ae304cc38831813a9b504984f090bdea48bff5d78644748650c2e9c0a8f031b61902e5a787ef9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-AR/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/es-AR/firefox-78.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "81aeaf4e97d53db8dc93d0e6b163b4df6218621781dcabd85755baad71a4454f406d5119d16044ccb867f8f6826006943b72d97dd6b5d658daf196d16bac040e"; + sha512 = "06e968619285332e5101ac0f7257de0a5326a5f44c0e92a5e7aee3a1f57b021585841179591d0032e17ad4168d3feef5a8467ae5660a6b4d815d24844c8aee30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-CL/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/es-CL/firefox-78.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e22ece882fe8141864f1efd7d72774aa659cea88ac45380c709f8da92906b8f0d72ff959add05b6be57955b4687ae52a138b51bc4da81223c16ca40b76c056ca"; + sha512 = "e50c1eda0d1362ce5a3efd5495a9e75b2fc5d1bc1d3bb3f03b92e89dbf59e751823af4c24cfad3bdda798a2202dd9f204e575107a8e178ddce24682b40ef9a53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-ES/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/es-ES/firefox-78.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "26b6d729d72b302d38d7a372e716dc9cf741658e3c42c7080a8593f3eb5e5e96fb40b5188082a2ff9eae528f387801f034744fd2ca47cc279461669550e29502"; + sha512 = "beb673f020367194ddcace2b1647a33f95d7fc017c352b4ecbae4539e4401b11bbd7711f4702cf80f5f33b29e6536083d5a40bb5dd9cb661ab3b718ffb976620"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/es-MX/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/es-MX/firefox-78.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "2069eacc1ef1ec020088b3406755dbe2cb178f53555371f7132636033b4ec4883973a00f5f89907f8d6588a1cbe7fbb2d0b6dbb9d42c74165698bb222669bf42"; + sha512 = "3b61c3a813e4271ae70a8a5bc0b613da11c712ec3cb3965e95ad9c9e99889f755a22820d950a75e304a68f5861fbd204dbe254debbf1987a2d4300167291c396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/et/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/et/firefox-78.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "1c2c865b8a7106a91ecc223a167216da94be3373a4d43012165989e6482a3d0a90f685b163f5bba50d14d1f2abe1f0866d6f1f75871cafd5823b060d9f6272e4"; + sha512 = "6f5b9bbc855f8a954c72857526a4c687bdbf6d3997143096ec74562ccd1033b0cca6db8b48983944a1e2b60781c3a6c53fb022e4c10bbef07ed0262b354614cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/eu/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/eu/firefox-78.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "3f2e68d6fe86a59cee48023cb646d5002495e2ae416ee18c7ae51c3e48690969c704da16e574068ea7f91fd17cc581be7cdae8303f0666fda3025cd87f173c4c"; + sha512 = "d576c709576482053ac445f8d83efa1d6a6c18320c3674bd7e71444440aecee0a6e8ae9fadfc71cf36f152caedc0353a472a8ac4f7e29104287e5c7bacaae39d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fa/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/fa/firefox-78.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "6e6c7a29a1a20cab73b82f2c6d6167c8de66a249c0b02170c9a1ea052bc1eb8af5195dee3e83b597004127639fe96b4d89ffd020625a0aa0369dc47cc9560d05"; + sha512 = "b79769bffdc1f7b9531dc7e58a48c8a93b422a6608a3fc94b7f781da1fe1f721690d909033ab8617e5dd71b00db513604af033e667f87064cb139822adbef4c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ff/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ff/firefox-78.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3975634e0395df6377e7a240d4ae6328691709f50f115a0c364de9a9da849a6655c8397defd80df6e8edefb6f6b413bb877fccd847bc56b1bf71431e2151b114"; + sha512 = "f71d4692e0a9ba2d0c4d982a543d3cf7a1fd634071d0926ed5ce9f97880e235cf9ff10622ff6c30a0b8713ddc7708cbeb7ae823dce9adf79657f49cb10bacc27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fi/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/fi/firefox-78.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1a96293cb6aad59b5706ff26f7324cb6dafeb9f17de4043c03aa789b9a81f7555218213923fac0abc16700cff4bc68848345f99376696025238122626a341177"; + sha512 = "3d6b4ce128214edad6265144f3f1b800d311586566358807a62a9ab13ec4da090b6898799890af4b1cceffc0426328be189fd66daed9398c68492b7d0695a309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/fr/firefox-78.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "1d3d243663ed47c7ee3ab68a578d87769b617a4e961572d3db2b34dd62b8b1c997d223104ded10b42a00a0f0382b0ba10c089060f613e30001253ed008b09ddd"; + sha512 = "234d91842553a82f854c6802137949cbd9e1b8706d887573ca4597a81aea08086d531ba01858bd441fc996e30261bf90032587dd4cb76b906f993431517c266d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/fy-NL/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/fy-NL/firefox-78.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8f1a40d1a46e5b4bd9cc679f07893f407b1ba7de11cbaf0ac6889ed9d344ac6a9f10842359e85f92187256548365b038d619c58d62eeb80538ee592691aca6f8"; + sha512 = "fb00b7749dfc4fc64a9d08e5d07fee6d79d10c088206eeb0ee97382eaed813c30758745ce4eeb0352549e251d524f5c57c440d67545a0844c17ea611247f6ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ga-IE/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ga-IE/firefox-78.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e15f1d055f6bf4c81736370577a102dd4ffd548d66bcd6c74c807d4996d400979bc5761ae5e5053dd0600b9c7e69ca0fd9e4b03f8428032e4a1acd3485a47f37"; + sha512 = "ebaf22f5a885fef126e5fbaead30d4e1eaf619ebbb3c87407607debc0957d3b39016422005123f3ace25c64aa306a8a4eafdb5a82487b43aa7058ba2447dea6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gd/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/gd/firefox-78.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "564f101816eb3812fc1498725562205f10590b8b2a97dd80fb2f5965a6f69d6dc10d42ba21171b4064107e8403ff81bd6a65da13d302d93a142ffd19dd13778f"; + sha512 = "19d26827df70204f6de6c350aae53a584064edc6194de1b4957e5c504d20a32a3a39566df74196c33ed4d91740d730a21a63209d6bb1cdce9a70e494c9d5bccd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/gl/firefox-78.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "bf67fab5222c481088dabcc92f1298cfb4420f5d4e93c5e320d6bc1c306a51a4fea98c7bff52821b61b70d02c7cbb2e0a8a01bd76a21bb5d8dd7ccbf1a2cca72"; + sha512 = "ad3b9da6b560729d32e99fd92c19e089b60123387ef926abee962120b6e6dc84461dd31c25615eacb09323a8346bbbd38d052b6ecab80e2d88ca507db8084176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/gn/firefox-78.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "306887a8436502fbd8f6654b6bcff057cb279e81e01e05eba6394a109fd21ca5d5b45a61570b9b880a5d104b1a52b002a3efcdb4018b44a9437443e3ea4678ed"; + sha512 = "e32243be5d9b47da6e4307071a1a1d5f9d323491604d889d699f96777296cb3e03961be9323d2fd0910d289e2721aa025068dc7a2fc30ecc53bcdfdf73469fae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/gu-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/gu-IN/firefox-78.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "84a27c6b14035bd8a6679e954a7f62728a24b7720cf32f1dd93533c97dec7965a963bca8bad7ae1b1895f5d8b30a9356f8fb87a45ae2bed99661852107dc4613"; + sha512 = "fbba7f14628061f5840b13d48797297515eab2812ce858db1c8d57e1aa30818cc92d6496e411dd437c3cc1c96a37d9b3e6029b06593cf2cc952c051a7f09f89b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/he/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/he/firefox-78.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f9ab81b3f184c3351492deba6e4cdcf87306c378eca65813269d779467c68951e9000636d2ed6bc7d548453a5be59b50db2658e69d385bcb800eb452e360a245"; + sha512 = "a00ecca4ba4c6360f039becd87a7c3a15b5ca8e8b371791ca14dd22504283dea598a3f8dee16f060dd23f0b9ca4ec910c671cf69e39f0afff4ee80705c5d42bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hi-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hi-IN/firefox-78.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "d4ee0b984ca5679fa4d5922c321ba2e96f7fb2f6e0c3221eb4e22b25cf8385869c195e668932cf95b28efb17b7f9946dfd3453e679047d74eaa49032f7f494ec"; + sha512 = "f38845963cf99e8d0de6ec82fea1b259d0001389bbeb08827d9c602989ee9c58693675c7c5d24428b2917cb0dad3fdf50b3183d8cfd5d06a5c4557b6a7f57ff1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hr/firefox-78.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "f8217dd5f3772500584eea717cf142cf7a16655ed02c2628edbb6ef43c8a53cc8c73e3b829bd71f98e1c3d8e54619155ba5db8f988a5435e86587367ee754ea5"; + sha512 = "7770470e02621740a8da17f917fbe17d97d9f8d484bd0de0899cc8c4fde81995bd6a27d033ad99f67b858f00f18f1561a225080fddf832030fc156bcfd34dd68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hsb/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hsb/firefox-78.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "1883d76849ff588abb135f594ec7f8faa7c6eed2dd899ce4d7fb5e3f20e0884cb91bd6c606248910dd1d680c516336faea352b043ef7f0cbf95c86b82fb8781f"; + sha512 = "bec5c0fe7e41a546ea05c6e311a195e84652e2968f25fb0b8daa8677e5feba9e9363c523343789823cb7f4333ba217ba337c6e05bdbd7c1e24679794f5391254"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hu/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hu/firefox-78.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "36434f4fd5be4c50bdaa2b2a3ebea4ba1e89f18d51b337d17455a35169c3ec65d5b0aa17c6771f211b81f607175b6df754a28efc927a951e4d34072da343e0e9"; + sha512 = "e2cceb23880ec83543b9bf9d05cdb33df99637c8d873706f1a76d9a5e7bb4f838b469f729f5e5c857cd4bddf6911b25800c01da826d8abf54da9e63e2afcf17a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/hy-AM/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/hy-AM/firefox-78.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0b09ba2521e364fd839769725292bacee154806d94239e21dab70e4fd167b2295cac01e070cc5a50b1fc767ed57f50bdfa428fd5aa57a2ce6d2c0639c1b82807"; + sha512 = "fdc7528f78dae192b08c6fbe4221ebdfc60c2be99368a11de0f5db2fac6d04dd069b4c5cd3683bb55d87e6152cdd2ae7e0725499171021004dcc03982144eac9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ia/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ia/firefox-78.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "2753b8d3413bad99cdb40e4dc2576ffd559e4ea92a507e0617e04b8fa41abef34ee642d6e8bb58c973a837e1483d117638cc49f1df3f485987be96c2b6d0dc77"; + sha512 = "4916876d76ed40eb21ccd99c68ba9fa326b991577cd97375425835aa0e7a3fa84963a72b03a9a8b2b37b969fee812e7205a7cf4facda49e74961f06819f0e2cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/id/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/id/firefox-78.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a0f863f34f4ba67c049749453220d06f9737d855f6385c16e933a24c9a73f9a28928049fb99a89fe976db9224f40fd90495016388c5442eb0b977100bd5a8ff3"; + sha512 = "e566b27eb9a493571750d199e77c65480ef075fbfc4fffdc2705b197aa3521e5808b23bc9229f89c9430ff772a29694c6eb35502893325cbd94ef18d3a6ce264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/is/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/is/firefox-78.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "4425c986b537b04ad0d9740bcd835388b1bfd3a719867c7ea264eb1665a96deca9f4fa58d84e6e9dc7e038ab9bc55fe86fc69381c055f88899fc68b39505f393"; + sha512 = "e92585293cac8457162b969b8173056d7946641f598e277c03c36a71ab1dcff3efde2d28b1b4cea0136294641f2fa414073192887f02249e344d2b653d4505dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/it/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/it/firefox-78.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4869bca5c889deced2e2d1029262726db3aee7a1aa5c79e928038295c1367ff6003b030ab2fa8940fa1920129c89636e059d9b20e20fa43f2dd938a44995b4fb"; + sha512 = "af82be9e0c19451c2cf009240be9aa1ea85f7f6dfceb54663bbeb43449f5302efe94ced7a6fae71bc7c402de6e83149c5d2999f79c414750ef58714ab292ce7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ja/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ja/firefox-78.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e4f288ec38c5a9723f3c653e3d995f9cc2c2dd86f285277a1b44f315df2bfe51e6ed58db00e7df1914b34bcad3b8258ae43075d02d4440cec2c1fd307baaaa9f"; + sha512 = "5005bb3f0f0435fff380d857996e6b14a81654ad879609b9db6fca76af583591b3ea149fac119f63370195491bb9a235c5dbb49f878d77dc8dd86c4d196c4dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ka/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ka/firefox-78.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f03488b30e3551cf670ee3a193452dde79c72fb5ed63288c41922e627ea0033cb31b1117a4b270260235492ef9d37ce7b6317d637c2495d1732c606aa2d5f6aa"; + sha512 = "134d29830fabc73ac1b880d918e707e779ff8fc947bfc830bbf959a2fcb5fd505e1c8dd1d4fef6376741ddc51d87f9eaaa9f358c734eb372a8c5131d87c8c506"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kab/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/kab/firefox-78.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ed496b1cec1152db8f63a04f056479019b90338220b163f1da1022de11b1064dff1dc32299f92a0464073d4938551da813f88d5dcc8536c61abc84347098cd20"; + sha512 = "cdf7bf73277af59d69077f528b1255edc81eb907d587c620c75ce0ae41affd82ba6f3923094baaa4a5d1b2e2ab2324066f82845fd21b80cfdc32dae89d36492c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/kk/firefox-78.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "01eef4b39491227ba2a0428066fe99b59222dc1d9c98d435254558d14d91b4cfc062a2649d87c86da3b83e327ef8a7889a78068ba1e118140dde8d696aaa4654"; + sha512 = "5ae069f81714b409879a525f560b64c6d113d1c824b1397b64eade31b2ea0c90d4f406c86e6bad241dd03c6eeb693182f79446e0d44086d695e86595410d28eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/km/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/km/firefox-78.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f284b80465c175a141210dc57b4bb472418981197ef5c7cc4b32c5d2d65898dc9def0f29a096d14eeb8d66328713afdbedd26e9b88a969a43ec62117c2d38d0b"; + sha512 = "642bc1a3ff81f34366c124fbbcf7dae88f20cdda44ba9c19296c62b2ddad04166dc9d8449f58781044924fc42cd2e9ce7310227c86e6c3aad8e7bb5420d1c006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/kn/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/kn/firefox-78.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "1b3f97c710a45441fb66c83ba6b2e648f726d8fcd0d245f9f8121a86d878c6bf3b0b114878d70f64f6f18f057218f84c5e30ea0f4f4ad8b1921d22ac9aba5e7d"; + sha512 = "459ddbc9d9879963bef5c57429d8622171362dc6c23ddc3b3445a65b9e7fb509b5da4dfac579841079b886f2d62252771f672d32ab5e70e8af4fff577bf059c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ko/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ko/firefox-78.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "4deaf19c5b1fd396566dabd7f9cefe416e29ec885781f7aedca1bfad37645c2878a884b516d1300eaf2292220616ba494be4b8d763998cacd1d5e9e5b7a902e7"; + sha512 = "6d674f5576c0ac5d880e532666337b334ad304a41a7974bb488036ad246386da6f21dd7b77d618e53c474798533b59ce8eade31b1ac96a649e86ec9cff51b4b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lij/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/lij/firefox-78.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "17bf34017b58765bc0f90d08ac8cd73065edb223e1d8222425122460c8a502ba2430caca3447e535ed9f444dc5d05b5958984e8a87e29dd1b713095cb68c130f"; + sha512 = "95ff005b3bbe950fad7ee04f1f2fd81c35f4545613919d86172f2f5173c52c2fb4bf357d929d007f576fc2977e0eeb3ba2ae13ac7aff754c3d4a52ab919f82df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lt/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/lt/firefox-78.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "43240bde81bb7a27a9a9b9ecd95bfcfdcc701441a5820ef2abfc0d13fcb8eb41abe240e16bef0a5c1126d498216c9d2c5302c787c93093665cbadeafbd81bcd2"; + sha512 = "1a5e2f9ea0dff0070acf0bd62b5aa4a2df6f545fb736837d2e49f68329766d7b4e1fb75a23cadfc3f6780cb4fb77bb2bdc7292d0c6a48e2a5ac0077599461793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/lv/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/lv/firefox-78.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6c91a4d5e746ce88522ee9ab1fb5ade7293365eb3bd67f5f5648fc8b298fdb41227408bfde8c567d238bf65ba5276021edb630c4b8f3314493a6f2d5face7845"; + sha512 = "d79d11a4147e3a10f582527848580c32948c4868d06f521914b159534f2285d9371ff12f5abb436296bea2e8b99c4e0bbfde10281f07543aeb8190890a069698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/mk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/mk/firefox-78.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "c9a29a67dba15e60aa3a08499c19c151ed88e4f9b108204fffc42a56cc2b73f2ac65460f1f6ead90595deb1b874a0aaec466d5decf3c975c9507f32c6708e4e4"; + sha512 = "9af70af0e6e997081cb2c8d899462b67b649821bd073a8ce25dd1cc16204d5cdef5a23d633ecf25d52697941f7c0edf0386088c91640db173bc029976e3bc320"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/mr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/mr/firefox-78.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e83006eb8bb225c5c8961e73c02dab509cc99be714a563f7de6203d7b1f9aeea61228de5c2c0353203bf206d113af6d95b47ab83793aedd0d8fc57c66774ed08"; + sha512 = "c766bffdf742a3bff9620765d5536b1ee89674678aec48c00f7cc9d5badf8f8387f1a83b1429e3eb5d6753a5c97f547b2b71686f7c35ff70d7339d83229a9772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ms/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ms/firefox-78.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "30c08210314a0bb9854ec3ec7db222bc03a3118578940f28fd503a90b266b3d803b59e4d691be4d5d50281b6036d3162676a775de1b0d22d57473ca4f277331d"; + sha512 = "6de6d32414a251c0534c3ff794606d44489590c54ce2b9e12254e1743e38c5055149e9c55337bed4a487b2de5c47200e69a22d1ad6c126f09a6dc63c171db850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/my/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/my/firefox-78.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "744153ef1626a18fc6295934e4ba53a12854f7f8eee73a451e996ff9497caa7c33a85a8fcda2ce8c510ad516568909dcf793acd69f2b183775dc2e2921280c6c"; + sha512 = "b8e12bdb581f5e3b20522c15e35a249bc270e63fbaf298a955d42e7ae796e411b903689fb930ec8ed0a7a607ac143aafaf74e67b845ffbdf2907bf06590393c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nb-NO/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/nb-NO/firefox-78.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f1519f65a3437394906750a19b9581a2bbdd295f8491caac191a6d702cfd81eee31dc58f18297a2c77b7a3099c1cde191017590881613cec21ece0abb3b33b0b"; + sha512 = "62913a53dee0f9617da39bdc9adec5e500b85aeac68fcefc3b0797da515e570ac0eca70e142488b6de61ef7684ca5e3b100c6c4892660e7132e7cb77c2668a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ne-NP/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ne-NP/firefox-78.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c433b58a5c95c8bb15eba38fbbb443ddcd6e996809e382925284d46c5357901f3996d677cd1a7a4e3afb5d36fe9ff7aeeac9202f333a0acaf4cede1932fb9c1f"; + sha512 = "7d5c6b977b0e274c32932ef3c0c430a434cbe82664907b7fdaabc27b06d4d66b4d7a29a266876089a5647438544d0c2de82f236d394cbce5bcc095e0c627e91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/nl/firefox-78.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "4a08f0571fb66742cf99abc582f761cc8dcd7297bc66db56f11f12bcbc5c46ad0030b6943d31d4f42faa9b2caed5b25576df34d4078ffad5712bc1cd7f9fb3bf"; + sha512 = "7ac864091f66ef5be5d64a4c858ad9331c46a1b801a24da83a440062d4a4eb7c29e39354730e019a78f5d3ae0d52011a11d24f851a05015ad30c05e5e66f8a90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/nn-NO/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/nn-NO/firefox-78.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "97768cf2279b49a5d2ee5dafbd1315a9645ae017d6658106c4dfed682079d8b1aaaed201d8b571e8c00a5a305e5390a7f799307f167c24930b6e08b601586071"; + sha512 = "0825347f0076b5b6ef9f41811e7be2577d534031fac81d2bd8a7b8d943a08cb2adeef43ef31eee3c22176f22af7dd92d73d3f66cabdeb11b70de2f2093952b1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/oc/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/oc/firefox-78.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "2bfb1e7d79c8c7256c7a4af08e33bd3cfd7bb3b5e214b06d50714d602b0ed44db5556d555d506b29d5779b86c8f15cabd6e9d4151e76e0c4e03003a49f1e2460"; + sha512 = "336ddac8c9d3d0f1ebd56d693c6a1a316622a8abd75b37ffc1d0f511d1c1204f08b2997f95639a4144fbe70921e098b2eadfc036c0ca79f840a54f3cd6fe4e56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pa-IN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/pa-IN/firefox-78.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e53b42fcc15613bef2201e2c8269269901130884fc7b3d4fbb5cc3eea1c9ff1a219503c2e2960643ae23ed0ee99287ba977f55f77df00c0cdbacd380623967ff"; + sha512 = "84b93992b7b424a0253e65aec272a90c603867d513191610bb8000b6317784cbf8a706097e64707bb7e6c5b8c17b2ac0c2922b4d78168aae792706142b637f49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/pl/firefox-78.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "bce7db6d18de63080a806dbf8639bd2f6dd00876605b17b9fcc741678618f1f17a5d991c461daa765cd2f3f217d2f39971e572e2e607b91bcdfc8ca15529526c"; + sha512 = "df53aa6a153b6cef0c1f53907131f046aec359a45dce64ac6580e887c233b653ec8a363374a5d39a755388b8bd562afb01be537f2192a4c7ba6c95089b8615f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pt-BR/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/pt-BR/firefox-78.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "7260d2a9ff4fc0b29f5c72942eee47c36b4041982924ece2a32f70a5a821bbbff07ebd57a3b97c64700a6e7815e3f00f8fc521ca7f99192b25f3199089b33738"; + sha512 = "6c6322785cc4e5f7597fdee4261eba1c44f4aa65fe25731488bd4a755baf619d08d4e1c8b3ffef328e5671db3f01cdd633f0405f4d234763e5e6d28031528362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/pt-PT/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/pt-PT/firefox-78.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "47f02eb60a50799c542ec8f82dd5e43a684ca03dd8daf487d651a33c7ed78ab12be1ab910c2a658e67645b2537f6f112d9000b59377be448c066f218bc9287a9"; + sha512 = "88c761b94b4f2eaf3fe3b977b6c9ff57ce5f6f378ceea6d892f04e8c05fd60a2af664dcdb96fe2beca79d78032282a8d97d9e963cae90883b00a53d90d975c4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/rm/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/rm/firefox-78.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "dcea73109f2c6bd570729175e136856d1a8141cd3e6caa04ad5a0b94096171587980d9567181c41fcc950da92c15155ef23402ff7e97939fd7cc4d3c6d349e6d"; + sha512 = "8c2ba93f63d0418c9c89db8b9a80019940483a233520a5c4803f2d4731235c05e2012610118d90376d53e1ea3e32df69f0f50cf1ba6678f105ed1cd7b77d251b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ro/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ro/firefox-78.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5189292876c243ef963f552123876d9a392a258efdd3704d4ac2b4da26d98e3ff5d281dd54be89ae414c8a78abf080234259045326487eabca45a645a1ba29c9"; + sha512 = "3d11bc187feceaaf323e4dcd146ac9fa865061c61185f2122603eb99b9b619a86f1ab83afe5a4cbc64ec70fa400c5039b185bc36f397f4f642a983900b7585c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ru/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ru/firefox-78.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "c4ced260fbae120147c18cc03be8ed6c604c5b98c4c63d3f7ba579154cbfc04003b5ff03c65617cb6a2c65a49c36c81fc1c1b2d6315e51ea368165d0c6fe971c"; + sha512 = "0ed98d7436ba397e4ac7daffd5d0b2b1ff18ccb06db97795be60dcf88f267bc72d47f7024deb96f4de79e9386841dcb874ba2277de6c2f3dca12405711e56d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/si/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/si/firefox-78.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "84f62ba8c25c46cfde46e2dfd2ca6e9051d75ff4b930f1898da661714976103530571a39ba19f374beb4ecbcbcb30a390483d91433558e2f263d9106efaefabb"; + sha512 = "6e630790cfa072cdc65d264bc8fd06503fd27a0cb45a6ea2ee3512bff758cdbc70267f26ccd48cc0b25ec2d6a099943055f48e268df4dfab5b92a41c07eb2ee9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sk/firefox-78.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9f9792fb821396d46c5ef30acd2d71ed224db8a8a533a6dc3f0afe3b8aa7c9915f425d921fc2f8adc11fa3f5d9ef2580eece36f488417cee4b4dd3988d9f7553"; + sha512 = "343751675e14419851b4d44019b149033e19f0946cb99a244e087c61cb2ebe6d649920823538fc992abb746471ef411214d5d06c82aaaee58383f1e1f9971c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sl/firefox-78.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "55d0c5d17f80d9a35ea5dffcc93ad6cf9af2414e8b74bb7f0681dc97b9c7292a95a9175400b1710ce5eb78e2aab6ca9a57deba96df68bc8b0949029a4fca55e4"; + sha512 = "bb4e20af34b7897f92929694520b9763a1717fc18b4f17318c399d737f76f75b0a20c6ab64e74415868bc6ab9af7368780c8e6ebd7680fd6a610231a161dd1c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/son/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/son/firefox-78.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a341592537300f4aaaee8010c58143204487642bfd72fc25086aaf94bf916aeef57ac1a8cf5aa6d3456759a4a9416da6c72a6e222a1011bf3dcef3a1bacc53fc"; + sha512 = "5b5dafe5899d5e72ebad2b0feddb1a15992c4bd6d7f0c156bbe80eb09f8288f90186c05300d27323ad6df8f0b87f46c8419b77ea186cfce806a84e9a7894fc46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sq/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sq/firefox-78.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ce6f8b75467d9a97732a9541ceae1611b37ad81c2cac1a150502e4d96b3d2f0a35e3031f534cc974a13810716e2c2f4bd30d71f84076a98c0bff85b37bcdd51a"; + sha512 = "2865b9573e3fbd5ffe6ce2fc7472fd0a952cc9bda986b42456b811ae1fc135fd3d80910da76472d5d148fc96cedba78deb09b099568749dbe4f02c6166e7b7cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sr/firefox-78.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "644cfbad8921ad9101eaa2eb20cc4764baecf8c2ac29e30ded8470df6b103cd39f2ac913b30a89cc92b8cd6e2a0a16a2c5dec61102a599e43675d9edf59ce2b7"; + sha512 = "c1f12986394670b2368ba83886491a260776a8959d28fefbbb3e28f89ff15992400d6d52399557f7787b4b90d6cae59f099c94f0ff487912e6813733822fc848"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/sv-SE/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/sv-SE/firefox-78.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6b4805545d53241e6f4bd6de168fe642d502cdcb33d805f696e7622894b7e1e347870294b168f2be191b96c8d109bf567a0c102c727b0d6d399e4bf1f0e0464b"; + sha512 = "b1c4c8210c0f18ada011512cd7a48755db08b4067c7530e30a06ac34f43a863c0929cff714d2d78a79fbb3643c0aff7e901a0e36ba1d006cdb0dd9c42673f8e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ta/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ta/firefox-78.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0681cef623d3266b40cf3081c19f5fd54b0aac447684553fa9205735099bacd615d024f2205329c2c14a4f48c81cb7356039cb8bdc76c0e68b0c4c85c821f0a7"; + sha512 = "5ef1af63b19b2dfe49488cb11ad12c495a576a5aa3623e6b977031974778943ce5714ce4eedcfafbeb621b298fb45b13454798ef72040a17d7e1ae722454f39f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/te/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/te/firefox-78.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d1b4eab69607d6ce2b94841c2320aebdfbbf2ed71d09d2d34eaeedf18828b3db6c85062f52dfd7555230d29b5431db742ed261d76c7ff61bc8e652dd9af5eae1"; + sha512 = "8235d3907e8315bb1422e1b32f055571126f39892b2fccc53aeeccea00d896a0b8312e649998daf7ad2994863818b87a1dd14a48510e84caadc5ccb836bd98ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/th/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/th/firefox-78.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "2020ca64cc8aac6fc5cf45fb9201dfff33f29c453bd2e876456017876f7965bde5308464bf08eaafd457da2d51dbee385cdf35921ca8f92f651ed9cf3b900697"; + sha512 = "05c6fa9d79b7d3e4fa922abe100b3d0f371b60e534a12faecf7691189f0431d7cff457e11cd8ed3c6494cfe0736c0d90f3ec3ba553b2da91c45a99a183cfe073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/tl/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/tl/firefox-78.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "9cef23915220fd61dd699fae18ce7ceac585d5b704ebf8268365a36108d0e52a488a88deb49e0b942fc2cfc164d5306d1bcba9c2ebefaabcead775bde181f368"; + sha512 = "5f911a30b99972bb2b521b96ee50741a42ba921c345d7e9a820b9954e5c77c16afe9299ee5df98f971fb045d757c4ea96c269aac90a21d4fa7c9c6f651b125e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/tr/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/tr/firefox-78.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "7f02a59ba18c59648c98f5965bd0e960149b2edf121ebc2590353d4aa8fc26a270ef2fb16f9a80fa69e604244d56cdaf3029c12149049aabe9796e347fcc4d77"; + sha512 = "326798d3058adfd3d13ede18c643972e4435fc0ccfc126a1d9002c7cda264c94dd691c1929719f7dd0ead6e62454b7198da05cd2796c0393f010bc7bd15487ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/trs/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/trs/firefox-78.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "e1dc9905817bdff2db64f60440044204c9335c443b9db605915a4b412426ae877f5e7b2a83cb8b73ca534627d2b1b8b4b9a11306779baa8516ba06d85b3b9a18"; + sha512 = "6b92fe4b0eb39c90d05d15c4b0ad7fc0774e4351af2cdff620465c9d949ab678fd37e671d1292cbb4830d88a66f81184a696938fd190dc4059aaac91c9b7a15f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/uk/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/uk/firefox-78.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3bb99eda1b5c33418ae7267dfe65bb905c617818f405b80e775d70d6bb8a78f143843aa2256e442aa36304ae6f4284524ce4836a1c864ba06fe558c202f04258"; + sha512 = "3940ee3f91ad762937a1e7efb8e864339871e712d47348a08eb4ccf01a3bddc892048b6bbbf300f453ee0298de5d2269a86f2898579f34b70719c35b8bd27a86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/ur/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/ur/firefox-78.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "e1f71eb9b6b5f0dcdeedd3cca964a6110e6d9cf4e5fae815922135b3dee8bd6ce42c97b893eb922e436c5088130035793d99293ec1c5ce8c70d4ae5e0a097f7b"; + sha512 = "fc363167abf28830a0b00ffc9b9d1f51e8805518854369516491fafb4bedda2eae9172659732cd89af782381ac3a7636968405e8e084e4e39623eb32246ba691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/uz/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/uz/firefox-78.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "39cc68ab411bbfb784ea3a70306ad2fd27cf377e796f3cf39a1f68d70363923dd1fb0cfcd39f62efa2940439969ae0467191c0c62ac68dfb5205b29760f9a923"; + sha512 = "1f8ae3f175837bddbe6b6efb594085892c28abb557316b2eb991d94ea0f83f34210c758d17f0fae3c8c79072772608948871a8b03e075f3ea1efacb0cafc0bd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/vi/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/vi/firefox-78.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "4ab8ee124d40ed7a26ff0cf7257c60dc8a9879c82b6b881ee0fbae1662fa8e26f672ad59993419dbe93458723c4d4b1a1dbec261ec3811c348449a1a352dd688"; + sha512 = "2c6b5087fe7b58be884abc9bfff647d3ebf146e7b9497b2664d4d0ad055f8a335c93bda5149e43c18752e1fcb3f1b5d9d09632552a2daa15983a5c79ef1f71ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/xh/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/xh/firefox-78.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fea8a74c935e7213e551b1f9c2c00286eca13a2d1a987bf523ebabcd57bcc5dfdcdceb23b4d589e354f116900b8ace28e41a069fa0d8692656e70960025e39f8"; + sha512 = "0274824180e21a1b9b4e7d7bf5c03710b23e5ce68171c3b7a2a53acb173a081ae6038802896a0eedf933c278f0553c58d443557a6a8e5c3fe9146e8d3a6de59d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/zh-CN/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/zh-CN/firefox-78.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a5b1dcc1fad60e62f3d7b258193f7c76a807ec3efbc766c50096649eb1e4bb523a981f4b30c9d93a1bd814dea1d99230ad3091a1f8502ac44e177073c0afcb3c"; + sha512 = "603fa464a03e65049c2520bb237e73f528542a7f58305e6cf3976bb0581323daec01e7c925d269e72e9990198a36950a8013563e1c40aad38e6ee818e622fe77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b2/linux-i686/zh-TW/firefox-78.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/78.0b9/linux-i686/zh-TW/firefox-78.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3f82220802d5fee6502464faf62bc0dd7edcddd0bb93d9e9636da70b7a5e4760d1b1928976793d984c56c6aa73cc9bb13b687590b0a85b395137fa4d7ec72d90"; + sha512 = "3c91149a15e27e9e3bd3d5aa8c8d26f2e7ea92b8930e801d48c2fc8c9b67581e724d79a90bcb8e91a4bb4d74426c421962cc16938cda3292cb749cf204487795"; } ]; } From 37aab787f545631acd10a30bae65bdc4b3f2ddad Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 25 Jun 2020 14:46:56 +0200 Subject: [PATCH 614/624] firefox-devedition-bin: 77.0b7 -> 78.0b9 --- .../firefox-bin/devedition_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index f9045a4cc19e..9863ef90fc1b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "77.0b7"; + version = "78.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ach/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ach/firefox-78.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "b377d891ec1ede4d13a55bf6dccf67e9cacdad118241902ea97a1719f784cd8dcae47fc015bc79e4bf7c4a76dd66472cc56a39173021ee1c259bcd5f0b7c3097"; + sha512 = "379dd556086264afb4cd324dd314ecee65e09a2dfc63c3f2b8dfa1e3f8e5ce0e3300f3c61fda186454d635c339b302c8d07c613137859dec585cf50f152ff556"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/af/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/af/firefox-78.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "729d7a9cff65d7d002e732a4224921621e3b29c1afa0575506863dece3290722d916ab6072ddf6701628204e9b78d19a5b0ee90c11fc27772ea2eb30ae62858e"; + sha512 = "4b7b3e373253566c2672ad1d60b7b8af8617418c082f723fd5d3df9689e735ac5def3765f828af0f4147e74e347c288cb87a599cc5e611eb942589306625e1d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/an/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/an/firefox-78.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7421dac51885269cbdea9514e4d96a9dc9a5acff496176f80fedf8dc570bb3113d3eceaaf25203aeadf2357b364e46b010df2d973f0d8c39cd6df7e408d286c1"; + sha512 = "37f394a8609528aaf4979c948449ec8db79c010ffcf309c5430541c1cc9b5c198766efdbe0122b03df7f864027b13d2b3d156e9632d84a1049a3491ccf1c3d5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ar/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ar/firefox-78.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "922cc579853ee87f9055b48c12df6ae5a756dcb0e6fef8907ea0befec3f7c2d53f158b4a089bd8bd42765104e0118328d27da4ca8924e732125b207ef72887d1"; + sha512 = "ff487607504315e2ee466b350d2710f5217ac4de3c32bf6d03a33d80aeb404c6a095d10f423bca2f69181b6bca7e3d9134bc4a14943afa0d0d885acc347298b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ast/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ast/firefox-78.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6d193a8a8aa22a667de3fa4c2b53ce9d9a674919c7e3c95fa7357cb968e3dd36bbd123b2fec06a3cb08bc298e5fdd38c4dce690d10ff15bd31768c7694d0e6c9"; + sha512 = "2db7e4a70029f2866991fbf19531444a3aef8094f9d3fe49d413023e10b544a2f9f1472aa50d1c4784f6d415384ace05efdbbab9b382e164ab6a0b48ce32e702"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/az/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/az/firefox-78.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "5048b6b859650523c1a98d6f0c471dce49833f6303a67f8bd02295dbd341981d145145671660ded3c777817aaf970b478e377bbd3fb367fcad5850402a16474b"; + sha512 = "4664193864b34f060b720c186147c38a3ea1bfce23596de0764a220adebd44f559035009114da57f3733408b520319555cd0a3cc995d11642eb192d4259f8c60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/be/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/be/firefox-78.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0288debe1839fcbc9067e26411233b8b29960dbbe65c0878955eae67b91da7de0d51000e8adcac1e3f3e91d531c371f677e418366e50ed33337a4ce46c811b6d"; + sha512 = "3ce6aac728ff4b6eeaacd1f70af0911a017f5df92edf2824ecdf83d499d3d8e0da7c3f8a16bfaf99c70667510ac99fc005c7feca1b3ef08af1ccbcc88a006a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bg/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/bg/firefox-78.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "35821fcb332de76d2dbd039e9dc417631d8303921cb30947d39e6d0e57edd62f5fa1935238899076029189250a73dd657f25662f5bfdd193a5eb6227c706fb7f"; + sha512 = "d6ff09eb01548cf0cf0f75151f0dab3e959d888bb75104dde49db0245cf72db73c0177e1eace68d0e7a4472c310cee21a9c82536570f9275b8d3f3fb0069b9a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/bn/firefox-78.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "82b553daf2ad0e93232b655fbe1c24928625c7f682ef755e1f1759847cd93f0b66bd000784274a40ab5ea0e89985018bf17835208746197b546244503138db55"; + sha512 = "3a46ee6b89dfc60e2a989a4f8302bfd7ea43ed7d40c0d3f6a938d38a009ff698418e36a96e7e85c6ea6626f58dff00cff943678573215d7e49c150fdb3c292a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/br/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/br/firefox-78.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "69952a7d21006632a77c0e719bcdd3370d72760c98df348486d4f5c9d4d6ba73641b2133a615f8c5548e5708d4d68a499466d4ac32f690c9b76eea54f988325c"; + sha512 = "9d889cb992691ed4a0b8c5d77bf84141977c5741293eeefa12fc3c545b874472aa8a1ee352bd7cab985d5091463f47c5f0376b72b7dfc3aac36345a84a9324ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/bs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/bs/firefox-78.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fdf0975e3b17097469f54e57b99fd99b69ed8241263600524b1599db94640b4b7bc105a67edcf67b70766188ba20ba7e9b7e96b181c2ed6de020c112af75dcd6"; + sha512 = "408aa585259f2f8775108f54b3b89fcf2a75d4eb09621a462f942eaefce805f75a94ba50df7cdb695a5905202f1de0e27bd01f99ea73c626c03b5e7f596975bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ca-valencia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ca-valencia/firefox-78.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "438c3e5e9f6a34bda35ffced50e00012a9b84ef589b8868a7746f4f0abbe4143e591f5710d075def1187d61b7f289df0c4a5add6ba4c37227d04509c2b645207"; + sha512 = "8c046266c4c684e86dd64327e1c04eeb5bf581ea9f56146d2248d5ab40f37e33cb1512b11513eac3a87c86350d2802664894adb64d5a097eaaca235b4bfc1004"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ca/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ca/firefox-78.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "884d87560ea62da3218fc7bcb5b3b3fb9d98e70d5c13bf86627ce61e20aca5a8717db595b9141a302753fb0d704f1c1da99c0a8bb3e1f83fd3f6eddeeea5218a"; + sha512 = "41bca38caa75841d1d87169ce31d8cb9d5e356e708f607d2d4dd7818749ae05adb21312700a4ee849196d6aac7d1c9ae595b7c36019a23f18159a176cd60d058"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cak/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/cak/firefox-78.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "6525cd987abbd4e871122a20c25c4ba353272437b56f82e1a9baec9581a6a10637a85942bbc261a375842660606259fd030c59e325b05aa9fe7f3dda77864a7b"; + sha512 = "3edbe6919d52d94768fad0d0ae14cdc8d62822b17348c3ae9394e0816f06ad56e9fe6d383fa90a34400a9fda5ed0671b73e85ad975efdf7bad3ffb311334881c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/cs/firefox-78.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c3eb1d943b892fc41e25ee2bf15f0877ac297483595f7abea31332311e764353d8b12b7879044f688d8cc97f3104a7bc2b0305b02b8412a78e388e59b04d29ac"; + sha512 = "3eb8df01cd7f3be700f03df2512f114dce87556694145f1cbbb80897c89266223052ef055a91b6a5863d228dc2b70f4177e72e11c65dfe5ad24bc58f45be8dae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/cy/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/cy/firefox-78.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0a66eed4424c392f5dfaafa6aa198108757abffb069f8f665c06bdd24dfca08dff314447c57cd81815fdfaf54edc87eb67a6dd5c190e3512a15645e31d5d8428"; + sha512 = "b3134d0405c68e02fd49be1d15c80befde907b44fd06d9c84a5dd938aebeceae89df695e28df2aeda865c682283a80d61934bf387a218e029dd1d08faf8d4372"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/da/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/da/firefox-78.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e29aeeafc1f0d456dbe66d7ab07a632e91a25c62cfa03355eb3c4d9396529bf7908980b59acb9fe04204342b4c99f4f05ef5f440d638340272d20fd2bcfbc596"; + sha512 = "be2aa9b4af5004e1c46792c26219b8d810f338a7f453e41741ff23ada1ee7486f7828e824c67ddd9e2eef5d5a0338a1bb59b7dd448d47716dc8425221de2a92b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/de/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/de/firefox-78.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b3aaec2e3d1a23976378bbe526c63503406690e23ccbf0e255f54c5eae34452491f414d5a8be6f9d8e7bf14d6d4479b9819289074b342691c607dd1a013db45c"; + sha512 = "10fc73c1c101eb9d751dc16184a5131bbc233f33b2a5c416421a42c10890439dbbf39a364dc75422e02f69e3350d51c857a09e9e30c80b1f96c738852828601b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/dsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/dsb/firefox-78.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ebaff33285d3d78e22deb21da917174a8db140d05d511ad75dd1125361e4c1e7c6530f5fa096634f3bbe364c42c55cc0e36ca7066c05ac21822b28898841c49a"; + sha512 = "cebe56b680bdfeb07da3e5111f6179481aeb10c080df736bf6f920d6287537b87f0848722ced6b679c1e069e8224548de2217c1f3018b5ab424fef0e0d6eb3be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/el/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/el/firefox-78.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "706fbbb44ecb6e7acb93d7fe8c1bd5f4fb3d3fad7a8e64648770fa69756309c0aaf0c2ff583b2bccb30c9f34450631ca886db0343ace3fa80bc1a6e7934cc134"; + sha512 = "a1100118bb7ed58f0ba182fbad0962976d307645bbd7415aa618111539fea530c9d6a14dfc5c136690b5ba5013ac082bf58cdfd02fbd06b725b786e90bac91d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-CA/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/en-CA/firefox-78.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "62206c436f7fe811149936b8c73d62126e21874d63f66c72e7aff0e8d4f9fa26496a8adcd842071a602638ee01a14451c65c0ba8a2847f0b30b3d7da9c2625b8"; + sha512 = "0eea76486632298a11b160a2cc6b0437ad682788c1ca1b1b9d3cfa6561ac3362079365da9f134f5cc364cd9ca39872af65fea177e424febbb71706b76cdb8300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-GB/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/en-GB/firefox-78.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6481706c1f34378bc4c804216217b15ca90a214baaf6ad29ca0fd80cf050b4f5eca17d29427d0e4bb0a5c966b407ad7d4ce08c085a68a193a500480c9196c760"; + sha512 = "ad06e3fc4f5efd83160bbcf8db07081fc8701137d37f172e57be3251a47051c4f1ac61323042a51de4b310464eda177761d87e53b4271c747568708e7ad84421"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/en-US/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/en-US/firefox-78.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "74ece95a9a152addfc30de6f3daccbb64172c4081163467401d6459d4f7a65a7e459ec91663dd066f9cd7f867e7455e09fd1bad4fd9da7a6c3af20426474f95a"; + sha512 = "6b95d450d1346c6a862aebae3e910b1f50b65ac670aedace293443bd0a8da6509f4c6b286640413368d5452486b2a899fb4b1a30acbe1872327fc3cce957a8ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/eo/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/eo/firefox-78.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "fca83582fe7cf14948fc352981dcbbc136cafbfd19fc85732466aa8af27cfde37264dd3168e9388c12eeb624d9af561bdd4caeceffe8d42a393d1133a8c20277"; + sha512 = "3b8a2602d30ded67190de907d498718d6bce213556b74294a5789e11f34ef1d8613fffefeccc964aa8b802b4cb3dfcd5022b5caaba6dcad51ffc1b6a5db6924c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-AR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/es-AR/firefox-78.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "442f9e533a1fa892d19aef77ca64024938ab934f4f963268ccdef1a715a2c3f2feb73f9c2f6c46751217d4dba9f72dbe88ed1b1114be22e2839c0b34a68e8c35"; + sha512 = "4ed53101f3dcddb40ec3f4bf7f6e442cddc2a665e73125f2a944280fdae072340bae68738f37c0bc858b014b35fdcf41c3638ee0f83e755434ef904cf79c1a06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-CL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/es-CL/firefox-78.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "29f4c00ccf180e239a6660f5832d6ba21c733ae0b90150b1da128e7cd072b6ff5974c6479e161c7b646f1367449b8373af9ffd7d072bad2a190e50627a17816c"; + sha512 = "57ff61547ba0438c32f8fb099169fb2145e8b3106cf06146a43ac0439ea2df39040ac72c3b6b2ce2ab0e4e0a1e20e874561f8e73adb51e28c19ed8c24bdb513f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-ES/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/es-ES/firefox-78.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f1d9ea6a116804e7deedf6e6d62b83224e1f7514255394f78fedecf500cc3343fc9fad1da1f690fde9a7eea4d3dfe0cd214a99a2f9bf3b83eb45ab00cc12de7e"; + sha512 = "ac2a880f095b6044aeef91be69b1c56e28d9515b04e5cc6144dabfb6704c77f4a8bd037007497f37741bc6224889e811ba8e13a1dd5d71e243fca236996fffac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/es-MX/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/es-MX/firefox-78.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "8d4be6d04c22e1c98953b1a1468b2768d956b4d0190638cd24273d1a0356dd8479dca22566c5d45b8ec18a074be472e9ba9726b5224fbd3a2b7f05af3b46c411"; + sha512 = "67849cbe94756db1fc7e3a07678550eca1d26530b0a141c5832d456e48fcffd83a1e6622505344225291fd4a6d0e3ae6e0771f5cb602cc0360e2fe045253e144"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/et/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/et/firefox-78.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2c9962437d764aa27dc3d6a6c00e3cc40a456504cd74fe3a7f74a0f0216d54e9e4d9383fe6c5368fc28ae08d0b5424f65b9f50e33a7b6dc14c344a1aafb90fd0"; + sha512 = "2b5a6618ce457cb0deedf234595e61530ac4f5b1a27f858a149748fe3bf7d3681c6d10f795f48f6dd65c3d965be8768894d8e29e01677f6c274ca3af4b854af8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/eu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/eu/firefox-78.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c465778901b01e966fdf81e56b0f1b7667898ff0359711fd32e343692dd216704941e30c3ae7f4882f42fa297715f778e68094db85583c0e60a57cb91e95cbce"; + sha512 = "bd1415e571bdf7abe411b3017b168d6310e4eac84bd3634ba7f73f3f6eb259f54a3e7767b7ea4dce7a6f6d292984d201501c0c9d92c3490c1aa22cf29469fbd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fa/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/fa/firefox-78.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e194a9be6f993b177031a2fd3d91d955abb6d7a4d249e8864d5a894f1f9af87c39034801ebc9d1cda5f934c8259706c6e7fdcea344b5602f6d4ea8008375ed53"; + sha512 = "095169103f200c5a8cc6b618514a674f5d43d830ea1972ac18f5afde10632bc36c89b8cd96ebdb22d30c55bf27f7574f8b1a9fcf18fe25d49cf7c3bc85e821b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ff/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ff/firefox-78.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "613dd230689ca36df61d558db43d8d204da5168ed1172bd29e732e0a640d5f954ec4f5eb03e8c6abe5646139005981bfed716dba8fcfdb2e697627e563a6ba0b"; + sha512 = "a0e73d6e57e441fe267fe43c6f6eec4c9d4d2d77e9c9b3f1a0abbda37a31ac4c45791275e6e19d50aba3f4256b637637b58738e6fa5c164b734aeef0989e8e0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/fi/firefox-78.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "63dfc7ea59a29901165707b3c11f1087c6e23a27805de1d355d677943c84303b7c54c199d0610a714b930539bbde96991a79aa895fdd3f6952174548fe014d0a"; + sha512 = "df29cfea5faf453e17627cddf0234bd1896b7114a6c78f08347e2175bc1d4d8944b5af90da8d04c4c7e4a7e684990fbaa80b3d02be44fbe0583fabe971d79cbb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/fr/firefox-78.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "477539bce633a1447937d5689972fedaa1592954ea3cd1537f648d1aca9801fba8441ba6c35cd2148646607982d84fec743bbb115da6807f29790c38d5c22e45"; + sha512 = "7c848af02baf72ed1a1b74bb65485cdca4b55b11dcfe3d79988c5394dc1019ce05b7b3a421dbae7011921f5ea8c7f818672cac29103e087ad5344471629f9a7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/fy-NL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/fy-NL/firefox-78.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "cab7637566adf3d41e25915b6e94020214da31aa12a6e913754d1de2fad0fac9abf61686af64bad21eb07e696f23ece8ac38d8255848d5bcc6b0c1ba4c9bd374"; + sha512 = "e1d0a3611e6856889d08e8e29f251b89799c75ceed24fb9a03c7cab8753798b72b41beebd42777725d1166e1d306a6972f4a34a1a55031f1c3c8af5f430b680c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ga-IE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ga-IE/firefox-78.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "843f136635783c6a586ed273f5d97f152b004406c53958e59d265f48e5390fd42246c2e92491ff4b39633bcfa15ab1c8c420b3749a468b87672ad900fbe23de2"; + sha512 = "f97c61ee7ef60c82d4d044562da2e4331f3fe529b66774640ff0b098e9b8b05d11b57be4be13eefade43f06b7859fe1ff9b53abe9ab2b00d87fac56f72e3a6d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gd/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/gd/firefox-78.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "380ee84b44b90329eb253a604508584cb15fb3d36dd25a859dcfc8443cedefa54959fa958827132d1260cd040b70369d65319f8e18d06359aeb420b96068ea7d"; + sha512 = "66f1e68ef58259a90852e3d07d738b5c94dad69df1bc5923965af998b7fe7922db5ce40709575727054f8c9cfce88df6e4da9b5f7f8606b49985edfc270e26ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/gl/firefox-78.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e328dfe710d097c49062b9d0a54f42d4896177ad7ba174fb5e45b37baf78ada25089360bb0bc7211d605cab92a2f3c220cd1b78a7bc0c65ac17d15314c68dc94"; + sha512 = "7f9d3209fcb5937578eb34459d2d32470552941cfdae081f66a7411796f62f06000526d2d7054e72073c3b7431d6ad114d8d092ec70e001c2223992ba568cd0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/gn/firefox-78.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "2f65aa3b62e2573cbfb0591e1ccc729f983035c3ada9159e9fb8014263f38731d19e5a2da41943c0c540ff1dbc7620c9fde82c24dac49da7b2d920c1d7faa4f3"; + sha512 = "58db0dfade04dd4e73ef6b9dfd3555a51870e32085ddf1ff5287d5e21867bad74d4ab83c383508c42569ee829a02f44f2bc31dead67b8f1ccb62dc8b6c1f8e4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/gu-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/gu-IN/firefox-78.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "2d756897a5e3f7f038d3e000bfe6f1976611eae436ced45d5c06eea140ba26041c08588b6ceb7fc5026945a19a46715b154d0860ec7744762183f17d07b5e792"; + sha512 = "083ad0f168b9d9dd0b59c8012c9ad2bd297d5de971cfa226d725adc25d1be9d31af040b383ab655a494d5689bba6c0868612b200b5c69e9abd3b03dda80d551d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/he/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/he/firefox-78.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "fb5e2142f842ca0afbc5473dc3031eaba2bbc1f7ebe412d88696f05d8ab7102d9d8c57c318e7f6a8106b07e9cd6d7832ec9012868cf6b7571367ae1514959cc3"; + sha512 = "86de69997e354888101ba94a9066b5c482566b65ee89364f1d980d016509e67d1fe27090724df44466fb7b3a9a7a65eeed8b3a18079815a3be3560a1353a98dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hi-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/hi-IN/firefox-78.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5e779dc92115568c08ad511469e03af1b4018ed15638f88ff83df08cd5dacaf9bda39cb5877757f7eef3d0d47b43777eac5363ba4a2a4ea895663d8deedd643a"; + sha512 = "106d76c0bf26166a623c577c2a3697966af95ea4e5e9e0d19bceb1a60050519439664959603933f20d713f4057e3ecbef1fabfd79e89cff207a196c2abefa61e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/hr/firefox-78.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "2d196ec8cecd41fc5ea76aa535d830f98cec1572f7d8e7d8999769c09a49cd2063c9cc59314748579b8fb0fa9446b22df96b43c4f462b25dab96c265ba4f4d41"; + sha512 = "9711210d9e1f5df7055984d425584bc5a9936508478ede52bd1eb78807f728d3fb7b71f2ac57293cd89af7954e703d64018dfa1fd61da185df11ad7f1e08a9ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/hsb/firefox-78.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "647bf9dbfb8f5d053b84c507abc1b121387464542621264df72236a29accdb895e8c71ecef80f7a5a241ff4a18db47e4340f67a0653669e39cc56cfa622dbc1d"; + sha512 = "591dedeae2053b35a6db8b0ff86fc3f9be53dacc5ae60053d6c3ae1191805a0d2947d657e217440d225f32788aee2a4c7827547d3088a89dac08fe122e2aa233"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/hu/firefox-78.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7a67cd7d6c4563189c93bc2b418423d6f787b36c5b188411ce49f763421d66ed37404b9caa0bf63ec4c150019df79de1992ef5a98600e63b5a8902ab44354a0a"; + sha512 = "4b69259d4ff976c87f321f31de7d9c8a07e3a6bb5c038f45779586b32bea4d493365199082cd609a266ef5c4ed15fea3d7d0069b6042931074464e3ef1620ff6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/hy-AM/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/hy-AM/firefox-78.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "3a9fc6e362af83a1776619e0a5b36ce6f5e59cb46d2e8f9be2c57bc35b7e4e2f82b5ba4b61e637bddb470342fa67993b0374f2065946ae0ce24af1e187695211"; + sha512 = "e5fedf4eae997fd3e39699e0354d10d5354c5716cd469565d7f54c7da866a2fc272d0be43ace1d0436ff2daacd85f3696524bcf3ebc03dcca2e36ce1667139c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ia/firefox-78.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5eaa3a5d9b0cfcee453de81138ab9ffbf1abb58eedb97a6b1dddc73eeb919c89bf077138d7b86bf804bb545fdec404724f7f76936cb09fca3844a93c7008dea8"; + sha512 = "6631cdd92464ce6adb971fae4062c4e33fca2c04399890ebca3004c127c99e7987318818cd626993e9ba17ac807349815cf49a806766b695dc3bba7c6d6aad97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/id/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/id/firefox-78.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "714c19533e92d23d7ceb7ba07dea6842d6f378c8d705ab9fd51769720c1b7faa8fdfdc9786dee881aeb5106e5a38b840aae4f5134962db225d0d13c0a9dd886c"; + sha512 = "d960404ba82cea642c8d33b6120d2209a2ca454e68877f29e4d10f5f914ccd7ea6b35dadc554b1c8d6be4d5808511b48fe4d7959088fff8006d07567db0db015"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/is/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/is/firefox-78.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0b7216b9c09eb67d774fd0b8cf1a1b43a6cfd14d5327f6768136de3190974bc2fcb250f920253de8e77f7c61efcd23d0790da1eac2aeccc77e4e74fb4cc5d643"; + sha512 = "290f940ae69ba340eb9d56b95224f62c32e07f63df68a5ba9544d093cfd17879baab6fa2a87b0e0f3fb6cb946f6ef4ca218768b4903f52893b186e2fb31ed57a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/it/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/it/firefox-78.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "898c073e7335e7f2ef15abcbe9411f31522c2da464b62c2997550660dcb068fcaec2ab5e12fa4818816a34b37cf2a46bf9c5b36f65697a521cd5b0c05960122f"; + sha512 = "d07fee4329e5448b31523f95d11f272c82668eff7a6d3ba4558b54f4c51028a0b8d86fb9d04296f4c0ac6e3d850bc6ac700bcf3ffc12ebce39fc0e2cc7e9fd9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ja/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ja/firefox-78.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "f6dfd4d7aa9c1a0ced11034b59de3add54ef2b30aaff30a14081824bcfbd7bc020ef840f8c12544329b506fad1567400d2c7f57ddea22bd1fd37c17ddbe851d9"; + sha512 = "8c2de9fefcf5089ac0a914244968d049cccd493c4c2352ad0ba2449a19f93fffc327c3aa77fcb6184b61fce2fd78cfd03617800c727f7413c7175cb65764ab71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ka/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ka/firefox-78.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "5dfb93fa63f26772a52b7d52a0839f1bb624408097cf927de0222eb06fc9b9b7a9649475d2fc6a02e7c66ab1e6aecd8fe3d959452a73b1f9d3d1be6fa1aa018e"; + sha512 = "3aa5200932dad122da63c828ff54248bf6ccb999dbba6e014061cae97d30ee19c00daea1f72a77be7b8bb1f0a207dcd0c82426e13a532a5e175cbe8c016a0470"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kab/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/kab/firefox-78.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "767e3793cbe7e4023f227818617819026693287c3927d18193883e603d21d23c0239173266c89d776afc8ab0cbfb40ce9b4516e4663a44928abdb7672dea3f85"; + sha512 = "dec8074470353c86488dc9fb1c1be218b5410c877ef5f70c4c806525f0d1846c98dfb2c553195b64d558ea88899116e3f365a58de5bac69651f0cc988d266cdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/kk/firefox-78.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "b4b7147631146a53b9ab32f8a3319466f0837219284d4757e29588890bd518b45c7ce329cf73e3840c018a160a13f841851c407a0c4ea06cc3acce163be8cf79"; + sha512 = "bf07ad65ea0411598d711addc25ea44106e7b8608d0674a1e81024b9cdcf8538186eafe285e7e2de36c0c40bf4a24dff82a47d691cbbac48c376e1cb381b96b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/km/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/km/firefox-78.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "d3fc7706838fd310d34e9b45ee2fbdda352620b434e011a9b54aab598777001aaf24db2ea528da413356a486fa330729d121acf7e103905eac9bd914b5473426"; + sha512 = "0b1034c7df41ff2b1dda99270f2c29b4a6bb32e82072d8a30ff403774ff489fdb05616a459c9d9334f493e53a07c12cf43645f5182f597b8a817024c1faf5a8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/kn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/kn/firefox-78.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "61621680b5dddd1058e58e741d2190a7d07ca74301706dc61d823b1577ba3b76c72cccd30fa64f4b5b95748e6ee4077945d6b7dfcc21d648f13ed7be62de2eca"; + sha512 = "e4b46f136be69a14e75ed2db07764b16754edeb0f83f9542e96ea40c6a6c1a652cd56eda323386987e761330c3a135d0ca3e2b04bf73b7c2256a468d1b6b2fa2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ko/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ko/firefox-78.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "66677835319f120fbd2290d7a050f2846484229527820e3e49daf3b7f377acbbfd0a736f2e71c388691f1d04ee013864813119e7f7c5c7528887b8061b62bc0b"; + sha512 = "efe3b5b2b261dbab560a9c5458f5aaac5a114a5c9e05a9528411677e1bda1b5782011bc7ddd18a7dac13de6a7e8bc9a769e4831dafc381468829f3cf3a4b7ec9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lij/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/lij/firefox-78.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d590da1e993a5d598411717a9e4ec87876066fe106ae1cf37deeed77a0508885d47836cf6653d144be30dc21917a56cf5977f99f3c38d5e9843eb52d69a7d267"; + sha512 = "cfef1767caf46aa95c8237ac6714e049f6df0bdda9e7c8657575e1d17df34259838eda1d3c6df8d7d478732602cfd7eaedee7699f326095b9605f410cac1921e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lt/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/lt/firefox-78.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "450772baf4bec1a8077aa4ae1dd52d84ecefffcd4f93b9c486bbb4eec12c879a8daf2cbe51dfa2f81598abab6242bd63100d8243477d3176985a689eb2688147"; + sha512 = "56e03d276a1e62a161ebfd200711e78e468d5703aed3d442687becc27a9e9bf1db8a219ad6681bcc609615352d55a6472c3cd9fac122f567f259a98b3f151a43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/lv/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/lv/firefox-78.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3ef9bcbc9356a83b20f3f3fa83530790209866456f44f9115f8f22a1dece72bc28f485f24dbfb854c77d4306e2f3da5f759f7fbaf151ac8a8f303b2dd24832ae"; + sha512 = "5149c964cecdce3c205fd14a9993cf79f5417dd26764ec4f81dfbd3972836d7b9f61534e53e531de4a3cb9b37e3e37d9eb1abd3a4d7412c6d13bd31398148c2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/mk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/mk/firefox-78.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "59e8a7fdaa37513e11722397d9708db397aca75eecf3ae2e3b99f42a9e40e89b183c6ff36fccec1c310269b5a4ec3ff9f81985ece314a868585082e4d132012a"; + sha512 = "0b9af40405aa6fdfeb3985ac642e257148ecadd26af084be4230e0235f837525c654197f513bf557f9e39ddb5c7057ac03568b378cd71d878a71e476aced1c74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/mr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/mr/firefox-78.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "bb7a9577fc6080fbb82918601405e8a6da59662c9edbb568e558ceaf71e04e95aa3dbd7acfbc780759b0cdeaca4b67e24cec1aa57fec30473d8410fe717450c5"; + sha512 = "5e5af806dc7b3609e1359b6e88ef5a3c8dd1ed13d5d3fd8520cfe67b9665a018914e91a8fd0d15860b6719e430b50c2bd486b953970aa4b3e6202bf49d9aa4e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ms/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ms/firefox-78.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "e8bfbc9f54b3cb2d2a3f816329948f9e13723dc6c680c41e33cdf3bbe4825e89c9547144cf5dfd3ecebb0fe8759cbbedbe7caddd85c31007ab28b42219a8c159"; + sha512 = "6f8d1755d5c3a97c19232102c1241d43860a0915a7d0ab4f266ef6a6b3564f19f4f04b2aec7a756ad6d1d12298823e005a70b47e75eb3f9c2f93c6b4bf3de6bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/my/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/my/firefox-78.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b95c1800738ebf79b5ffc64fa1a11ef772614eef6f49faeb977677c31e545e4bbaec3c9c75567afdc75397cd40dd80a671ff03ac17bc62ede2bdf162323e6559"; + sha512 = "687fdeb0a10cf2d03f9b7f3f62eccc577e897201f870dc3f49148c7f610be04c9c593f8bd00b3a7964002e1662f70efe445023eb4f4efd918543f8881d3e899a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nb-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/nb-NO/firefox-78.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "505d68a0009efa7c8312fc5230c00e3d72c8412d6308360cc10257ceaeff98b3f22a5eea9ceaddd7566a9a690b4f0c04f91dd8a447bd338af02c915115cde506"; + sha512 = "3a0a47f972b3e72f6bad2288fa5e2ce7ba400b280d1366695729c4446adfb6a9a799f6f433ae17ac056999484caa4791b5f61f3112bd909b09aa3d1001065d3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ne-NP/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ne-NP/firefox-78.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "01eb90cc8c93afdc34fdc0e47eb5b4a012c9fe7d3dde1301ecece240562766066901d80cd3789e97f2f7a7188d56aaf7bd67c56c4e4a210b30ad10a738ca5b1b"; + sha512 = "c0df6d7bba0ca18712ef932d8065404d245c41ef009d35569e829657a2a572a31f5c61541155753214e85a5cb77ef84d9445840d58fd7c69f58be5e4673a73f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/nl/firefox-78.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "486aba5ffc551be80e8e9b35cd92b903e318a3870638c532dcfc10cf0a7d545825eb7ef54b74d76f66cca2e86e25614896f78eac63b3662b43ed313b853ad4e7"; + sha512 = "63959b74669f55d435c3e2e68989d7ca17f81b0f79e855b38cde675d1dc0f6fe8b3782ba20c5a1fe8eaccb30399ebce1278c891fe57b6a55213ff8bf7f43b7dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/nn-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/nn-NO/firefox-78.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b0e885c206d93c294997b3798a93738f99e4bbc459f7e8c7ff688414b73f69509686056f86b12407677a79b7d4bd7aa34f4dbebd5965c6a92766f3448a33cd79"; + sha512 = "446f6280e587e8df0c54219cea47f3445e87398c6a63c3cedfa3d847f6cf33771456076621db34d0a46454ef89a4bc99060cae052c1f2fb3cd2ef901e2e02bd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/oc/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/oc/firefox-78.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "1b04601dfa2110a2999dea0d6fcc19fc40b487296c705a403e741c9a9e0405fc90c774af7665c9335e605d6fcba3c8826701a497483b896e7911bae3a7ca7a80"; + sha512 = "bbc8b1917953ca5ddd6ca760848c233b770e798c38919ef978141d2fa5a58a8adade9cdec0e66f460ac38833b5fa55ea9993f9bd437fa890ac54fc383b3fbba2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pa-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/pa-IN/firefox-78.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "59d6957fcd1b2527cb77622df7cec4267d84fea180dbd2a7397871c90b2c27e8dd0b01881229eeb7219b548258d72448e690d654262ee55cfdcfa9d4a337e102"; + sha512 = "05f6b993ffec8e369246dbfc7708049b6700f1f662d3aed3c2ea70762a98edaf0d037d0e3859d2a1db024f95094f392fbd64714e17c8759191e7f76b858b89b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/pl/firefox-78.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "1d18dc2e580238d59997198d9aeea8673aa1d32db329c0dae79e52d9e3e64b063f4b96695bd18ca0a449ac3fd5bf77815aeeae05c108c139dd73134199a6e599"; + sha512 = "8471d0e686068ebd15c52d937c160648ad3e30571eb26667ea609f3f8c03393bce095b18c935bc1914d409ad564257f93ab52af1bafc05c47520227b8abaeea9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pt-BR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/pt-BR/firefox-78.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "1d8bf57c135e56eb6fd823c605e870aa62f2b2c4d99f50447169411a3877fc089c588fb085d4c3a2dd62a2a955c5f7bb39cc6e8c391dad0f6c2d1f20f4a5944a"; + sha512 = "d9f4e47f6574691fe6c8cd9b187b1d2006ed98e5e1844890d9ca7c6abada04716e28cb2b347aebfdd434d60aec38cefb6e322f2e56eda80165b8aeda52337576"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/pt-PT/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/pt-PT/firefox-78.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "41d3c18252287a172dbbd70c713e7176de8ff107ba0bff47c6f2546b8573bdb11508ca550fd8cc56d23172a84e30e1573dfa43232d4298c1862d5e8fa0ac2451"; + sha512 = "01b80e0e548420e0cd0102b413e56e5e05c86f21c0b756c10001587032ff0a5d773e00de3d7d19cf64beb96d2f12988d424fabeb5fe1050d6fb1abe7e25faf2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/rm/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/rm/firefox-78.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b0b485f098475c1a1d422b8bf170e77ddd3ff2b7b3432bbd43dda975522767b9103368c74b8a74b7cf5639b6fe72690380b9c7c94995afa1badf728969123f62"; + sha512 = "ff0b5ace23ceff3045bd6428656476c15a90c1b317fbe4659533afd42e4b7d8bab829042b3bdfe3ecabb6a132978665c4806cd8977663cd221c7166df93c2920"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ro/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ro/firefox-78.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "ad8312d0ca6595dcf0073fc2de8a52dac61610e2714500372250ce142f1220ba4449f6cd5f0c0a2754eee11aef5a71062e82c08417ffd0222d771ea701943b3f"; + sha512 = "b2fed50309b9e9bb7368b80941f867ee18bfaa0f8f369a6ff861b9f48ce5cd7e3f7acf9c6c01ee16f5a79d10ac401f0426764b01ed1a102cdd4f4fc421c69aea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ru/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ru/firefox-78.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ca9bdf02f34f92f0c752fbb55d6f69d17206f47b8745df9d224dca47d57ca1cc4b5646f374b37d1250733f66d83afe287bb698bbf783b08a6b7ddfdfe35a2e64"; + sha512 = "e8be53a00d9a5ef674c6063f080a4221a40f05490a34db631a8da734dcfa9d3af8d8a37422fa91c508743ecf040f0c3e8a88c6eccf3dc4f0c64cadeba2bd7357"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/si/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/si/firefox-78.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "2c621f00a6b2f2978fdbc28fceadcf2385711cc56c0b47c536c690ff3c7549a2b9cae71c9eb1ce40c7a199cc936f1402e7d3f5055a70b98b015ac25006019464"; + sha512 = "d89e8e963da5e995171b1b4ad0e8752f5cdbebd16f683bcde9b9882203733e0bbadacebdba199dec21fe4cac52152667612b9542eaf1d3c8e5abed010fe1c75d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/sk/firefox-78.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "2fbbdc40f1308513fb9064f6057a383af60d5a7f60d07a4918f6631d59762a2a8cc11b23de167ed0a7317c290436cc15443e6d893b92a53df1bae2b7da3098ba"; + sha512 = "39791d1da195e9d177fc7ba67a8ea2c95887921bfa70b989778721aeb7e825d946247e11c96ce30b0930366a7c6c7c4d6f6cc623c224db5e18e07b619b614650"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/sl/firefox-78.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7a993dea012e011c97b98938bdacba53c498fd15bb94b9deb05b27d7b842986e3748aef6a6bf96b1e288c8bf59df5ded37337ffd10063b3bf7afa81cfb1622f5"; + sha512 = "72a1c5e18bfa8d3572f1734fa9affee8e761d56e7607650f79c656c80d01872d8c7ced0157c5bf133837ad315e81e002b6a3426304c0a861c1f8e31552bec9c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/son/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/son/firefox-78.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "22acbd2b46bc7eba4003295fcd2fd01dd9e6ea7a45b7ecb595d55801030dd7baa7363f2d8b414554b07e8e4ea7418901b0412c43e5bc7a5c3c03bcf54318c5f3"; + sha512 = "fd0a57a959dc5b2ec131393be51d80cffd8d8faba9b3089ceb8e5bf19e3cac2614d2611077fc289d710b86c733200b5d6aeabfd80c13fb8edf644700849076d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sq/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/sq/firefox-78.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "5e0f2a51073728b8b90eef284f9e632365360f45839b0622e6a52c34dd0eb41ee7ad07d320e6b3610ea6265ae48daa05cfc022bff0b2bdb97caa8dce1b38e0e2"; + sha512 = "fdcba60f81a478dafcd547b62119bec04c16e8fbd264b6622c90fd3f155c54927f205a6b73cc7d7caab93f336ba4bbc42e9e31c4e76ad004fc6000bb1cdf242d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/sr/firefox-78.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "4bdd5193455e99f98ed90aa05349e2beae496c44718f07b6d81f81abe75d755f4a88fba8dc020998fd6199dcf1271dc7fff3177625e7872e1d271da743d4de00"; + sha512 = "dc03351125431c81d5247ae8fa83b7e8e72398f806be6d7c7e9b5443004da03d123c2def551380c8eff85b52253c70fd3581b11b94e1daf96c3188eba21483c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/sv-SE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/sv-SE/firefox-78.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "14e7db0c882d5a84439926602d6d706084001499aed5db4adae6a11cf7c25e95d0c77a59340c74bbe11c6cbf960500eac902a2ea23f7bbbffb9805b789242eac"; + sha512 = "c317f90aa1dc70dcaa0a6dc9c81f3b8fb14c8fe61e1956752cbe3b85e039b8e1f387a53a2a75506b6e56a2042b096e2b15789a41f2435b61c0d52b927e7c08dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ta/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ta/firefox-78.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f0948c827cedd46641a26facc08c30c1b8292d48d8d703fd7fa846bdd1c9f631feb64b50457fc6d10b0b2a6effcf304b659e1d5f666215613bed75307de37a6e"; + sha512 = "74d72946ef7a2becfea858c5fc7c848aa58014ccfbac5fca93205b6a2bc2642e5df3b02c4545bd3d29a4f379d76f50b2be803834949389aa945703a41dc53d4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/te/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/te/firefox-78.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a0df152f09d0c6abfdaaa1c3c352282374c71fb2cb674199ae8fe4c53b891d98a5cbb19c5c20e92e7cb602bf4be1b66ccf6db295cb91190b639e2ccac9c68b86"; + sha512 = "89577f313ae36daff2307530ab1eb3c73282141fd0dfd307084e79a713441190c09d500434a34e1b572a9eb8f0fd189130373f57dcd3ee5a144a9a5c5f290773"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/th/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/th/firefox-78.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "eda5d9fc2798e04addb6cf093548cd819a23ca480e392440838dc8a023e074b4b235a2df7a1ed26d4fd795c7e21c041be6f7c08d6dae35b05fefe9c31c79bb9c"; + sha512 = "3f690b0e5425f7fea8673377229d7d8e92e988f9cf3fa1462073a7aee1442f85406248cda1807d272244f8eec470c85116d2f241c630836d55b23853b0132146"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/tl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/tl/firefox-78.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "09aef5e2ff0eb455284ad185274fb6fefa2ff6f768a16e6301c58be9f97aa357bb18147d7a909694c69daae683ac636ebb16f800b6e0d7d90e931426f74cf3a0"; + sha512 = "92d95d8b20edd55ab8136402fb98c8e28c24253a3a45c3d5ac7925a00568e3fbec128daaa93dbb1d179e559b5cfd3fe3f68fb2fb92d3a3454adde2bd64805f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/tr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/tr/firefox-78.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "f936b11f4fbe0ee2f31b5c4f773e3e0044468bec15806afe21ee4e3f95862909f6cd68e35731ba29a32aa7cecc8c06120c3722500d9f3bd2912a29702045251e"; + sha512 = "04ca1766bc846a9291d669d86ca515d7887ed0c67793c192b9a076ae0b910069e310727c9f22ac919b6590d0475970f5705ac26b0cd9a3c734883ef20d6e7352"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/trs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/trs/firefox-78.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "4089f69168225d62d89bb34bf8c2cba4c9225b1b768e9a94b13024bdffd485d83f3389a8d9964b6afdd5575917d70070d7779dda0bd0119a15946ceed2839afe"; + sha512 = "905299a19706d0dba7be0beedb4b5ab482ebd0f058efc816ebbfa2a3ec19519a8add383b5c41625fb7dabe73d9596ee420f524f96b38b6bb8f0fdf7d611585d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/uk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/uk/firefox-78.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "4ecafcda0026949c745378e32a8bb68a1dcdaa292db74f7a88bd13e38dd39f2d1748a69e9e2827ad6e8a2a71f1872f0ec3cb846ff071954a41dee242ab233243"; + sha512 = "188cac17e46c9ea2a24ecd24de93a5b1d68a81b7468e49647fa459cf83b73dbede4be3d13260fd9bc61ec843893d258bd4e726b53fe911ebfc7007e9e37f6db8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/ur/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/ur/firefox-78.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "25bf5543b9586e542968aba4896a0c0c00ab5eaf99b82c8d9b7354c82c33d2eab68dbae2295823230cd5708ef02817a51e9b9f12954a43aa0c0b131a44388d72"; + sha512 = "26005358567e594f962e7a1b0dc20216796b2fffccf3fb0d586830222a953447d866ce95e1f7ae053aec2182faea9a202c19b2250f38df95ed5ca8edb734eb84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/uz/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/uz/firefox-78.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "90aaa4ed0f9377d17ec0b02ceb934ea775d5f378a01f8b4c0ba7cf5c67975bbf4f7ac59103e8002116118972eb6d2a48c6dd3d6cf515f766667309d0d515f994"; + sha512 = "238e51edbc2c267cf212f3cbf6ba3fd69ac8414957878dfad10e6e700971ce2fad2150b76b92542c88632d8ddfe3b98a4fe86ba39ab42df83d0e89503bf63542"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/vi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/vi/firefox-78.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0fccb7e7aa3ae6f8b539864ed44c7d8349ef96ae5d55d9ebec33bdc1dbf470a9a831b440fb0cf008e86421290760422201ec55e704b5ecb388155605ddaf35a8"; + sha512 = "bafea9890b608309604d644d98bdb874d9d767528eaa012a3447cc0ed852907f4f06fa86e85ed39f5ba23922bd372f1aba8648cfa3c4672fc04ff913aa6853b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/xh/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/xh/firefox-78.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "fd7d880ace4221cb8031bfcd9c90c07ed51fe345c9592791bcef61e52a29fefc035bce0a24a24594f310cb7113ebaae8525df0b2462f86560a45253b89b7a53b"; + sha512 = "94538371036a693422e28969f373923d5953d199617e5fb728439242fff6241e7177ba9c0c30e3848b925eda929d28338c7dbf50d8357849b24f0881945a3335"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/zh-CN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/zh-CN/firefox-78.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d7c386894783434732c56460fa30de8ecc360041934743b4632c8a03c36b00227fa8e23d2180a7f5dc742cb324329aceb2eaa4831c9eb9545920a95ae3b7db44"; + sha512 = "69e2bac008df8140041b23c370da8f6a07adf3c3724794f5d69c72442871bda35edd0736dfff5e27f0eaedbc916d7286740a9badd1c47b0b343c73ead7a2da0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-x86_64/zh-TW/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-x86_64/zh-TW/firefox-78.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "52a64ca3d152b0afa2be9206ad08fa1edef8411d41c23d984c4015b629bbc0ba21970c1059cda76041366221a193040db474218dabad7131766e53ed6b719d81"; + sha512 = "6848b817eae291435243c12831df28f0d833ac23a6bd9bf9f8e91afbe6f0e30148a9567292b176e7f533bf160ffe4396ef6f26f4d8e482f18acacb5c7492d8dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ach/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ach/firefox-78.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "d88c9bf2fc5b38d367a3e6210b59a4488092d42b380bf020bdf82b1c0527f03ecd48c08813a8bf73fcea48ff58a77fae80b2c907498f2d9f5275fc3a7f80c5a3"; + sha512 = "174c54576995c2149fe3901a606d980868c0e4106c9b220058f4e913b14688b6cbfbe9b3784998ef19e0f511ca3b2608eba64aa553d6f5eb0d151fad9ff64759"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/af/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/af/firefox-78.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "cb15b0cd5980a7021abadbe765c714604840a2127722f8b61bf9187bcce3b70af2e902220d5f0faa0cc7b3d513e64a250bbfe43a090d13ae4b8835db0c28428e"; + sha512 = "31c78d70dd51b4b3de1f30b56fd1751992f81d00accfac1b67e115d16d430a965e2f340fb802e894681f60eb2d432d1a391bd7d4488dffdc152cc3b3e397f6eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/an/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/an/firefox-78.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "8ee5673c42ba46e41ede5f3657a5fd7c9073fbf9f27e5583a0471802542012b67e8e0730cb58f0833fdb1d036dd887ed797b752d79290ad8982d3addf6739c44"; + sha512 = "48fe2c9d9d72603ca958e7afb3ca5070c16065e8f5c47a7c739f7fb2cc053316c9335cd3b048b160c01b87e8f9b17805fee7ff80d57bf82ff977eac6a6b261aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ar/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ar/firefox-78.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "25a2d1144a734270e0304bfc6a42a6f6585bb79e7289b381791fb6a45b86891f570c9c4d6a71de2fb8f0aefc6533a11862363ca60bdff14f817704fed4e9bb23"; + sha512 = "bf51670e9b92125b95f269eaef7b577b336d44536909e1bf1b1222293dc796d43a142378ac6b31047bb0dc4b04ba1e692d8b9f32b105a42b6777d24a8a1f3837"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ast/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ast/firefox-78.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "525fea1b71c9a51706033c4b2f523813e61666df6230ba51752a2161704c48c26ddd5d781285186beb53e90f01cb35e7de743723bb049b729fe26799eca6036b"; + sha512 = "9c90a031a21e4e166e2c08151e048637cdf6623bd61eb69e1ea081932b4840f241f2fad77c3cbedd72b7a5cdb26be2771430215ee1ac02b2554a4639fd5c9b5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/az/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/az/firefox-78.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "743377d9a76b6acbec6a7c005824c6286e10e26e30a6bce90a8750657d52e19f62cb6653513a241ff9a6f3cebb5caf63dc438293568db5418827cee6dfd94b56"; + sha512 = "bba9946a87468230c332bf8ce03191cba08ddadb0a4b40a7ebcc4fa3e89cc5a1c83b89f6cb2c2594573a1613475bd6f045297199fb0ec8e0d55adb43353cec5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/be/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/be/firefox-78.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2b96da128311fbf97cbb31e3b4b6e0d1fe0158ff7892195d7074de67e0f5b7e22f82c8131dbc0ff209e043d89191d269f5b7af224f6d2646fb5a58168b2f0d31"; + sha512 = "1f33deb4fdbc7042dc4e77b73b1fa55768768630f5065dbf819063a1fd93b7544889a2ec6e5d64f8bb214ce0520cecc65552e848a1d96ded78172e781964c6f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bg/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/bg/firefox-78.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fc5712958fd93700d39bc60799a32e99ba0db868997e1c0b4750bf6258caab3296decc55d14a48d9ed065b9beabfcbd9b7979fd9289b4243d0449fa124267e2d"; + sha512 = "ab9139dfb215fa455fa2098bb042cbd3c95943ced0eaa008ec7dadd745f2eb184b6e6023dabe18fc15ac336fc8a8e63627e0696b98dddd13592ac2280fe3e3be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/bn/firefox-78.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "eef007d4b60b487a1a8352ed7daab3cc5fa0f3e24a235f5fc28979c2fa69390032feac2590401533b66add014ef85f573e89613334b0b4933bad903c8576d566"; + sha512 = "8e37d06dffeaf777482a131ed750083d5d7a01324c1b217284c8c6778c2e0245c04bf7a47568dddd42d93b7211b3ea93ceb23a7609ddcc3e31d61674806c4083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/br/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/br/firefox-78.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "51f73c61512ac4f568161ea0dbc045a11dfdf810bed9e56a109c127b8e64b649cd368f02f06791433ef694190a08eb5b2efc66db48674244553c997b783d0610"; + sha512 = "531cd08ff36a6cbda39aada2fb0636f0bcda8a9ed619469f130b5c142163454c1f86065826c9dab2ffeadce14220163f1457b57269d0e5c054278c058abd1c36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/bs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/bs/firefox-78.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "71a6dcb6af95976882eaaf330dcbd64942decc76ad2a110e11721d8dce64c1fc28522520f2dfd1484b430c8c5a6f531c57ec96e533d35a7cb3bc3d688939ef8a"; + sha512 = "1173703700639a513062944e8c0b0f6f0c0a4817b60fd7ccc90924ec08702165fd214df617b7eeb325c425ce76302819d4a0a3446e7b8e4b7873f73e02312569"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ca-valencia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ca-valencia/firefox-78.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "e18c221ca0781c3a9a95ca1b2542eb7bfd66a09c9ceaa88b9d0ef76396f21635fd5d79bcc4881432426673865fe9aea679b8c4986bae668587371bdd237a3a89"; + sha512 = "4b0861025cbf0ed500712412c1fab3d562c92ec2eba11aaea013ae67185aa9ada0e2662a62d908a38bb827fd0abe63caceff86ef72f6028b9bdf5574f1eefd49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ca/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ca/firefox-78.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "76135be63a3da2968dd35055207d58fd58241846b4e680aba92541047ddcb97635ebb58b218dd86f86c94aaccc58162007e964a63099b26d139cb8537787ff10"; + sha512 = "5e7f762b8e0dac456ab673b8d6c0748d3728cbb587bdaef7b42a7621d4cbf36ca28e6f9fe4e49257f490a60b44437d4c13531396c8d3fb34fef0d8e8564d5706"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cak/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/cak/firefox-78.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "088e14979cca1a9e9296dc0fba4507e2e5a04b71211fd9c4d64032b6e76f2c5060eb40b331762727dffaae5595883e7162b8fa6c7915666e0c4183889ae64089"; + sha512 = "f920732d97f05b502a6d5b66942d8d63ee90e3f14458e6d12533cc42607a0243f0c3d2ac52e3465550e9ef95bd4a9e10955701c64d76e0257cb0bdb955c45ef3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/cs/firefox-78.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "35dc0443d861b8345610448ec145b1933c6de5eafca6fe83580632d086f0ca2a818bfc03cab85e9cf1aeb32a7ded6f47e7f9af1859c1432d8ae47f09440d81d4"; + sha512 = "bae02b4d0cbc5db8ef1ba675bc82e9e73c180bd481a1e45f058622141c08b62636f51f219f5e41cb60881a4f049f01c6b921b3e8fc3c9a35b4ec8f8850312dfa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/cy/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/cy/firefox-78.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "5d3ffd08d02c2be15fe5e66c7fce402b2b3fa6534192fdfc38f718d3a341bdde25012a59e5f8481314986fe2cbeffbd9ed0d79726067fa4d3658d27855839af7"; + sha512 = "5c80456aada7ca5f9cde4e933f7993cf9ef91c5ae77bd30a741155c9a08d22cb0924e86e007aa1af890b10fa636a7d48c7212ab4e6e8c745bb6fddf01d640e08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/da/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/da/firefox-78.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "79dc2dcb1d1dcd17da99cc668086a42b25b32f867cd381016f5cf76529363680db5c7ffe53f2660d8883eafa965e320f3d8bfca00dd84759685dfdd2d3504f5d"; + sha512 = "c2058678b9cb7a0098bcd320b3d1ce7911f515a6392c10e069c020cd61a44ddbddb96ae8e436ecd3e424b9309815cdedeeee82e76d26ba758ee1b4047011e18d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/de/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/de/firefox-78.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "075639fd73e2595c5bf99632e0aac36664675a3aab3b1b96e9fa701fb4b4a6988a4d966cd111a206fae5a6d21a79286d7b24ebff44738fed2cba0fcb7af29ed3"; + sha512 = "740561c2311d0ff22e64045d01a0cbe3608cc73cf86c4ff7a442c04a5d8d7e69346dfcb3343008c635cdb34a03dc45ca1a9fb08dbc7983dd70f4e5587f45a2f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/dsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/dsb/firefox-78.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "05d5b528aad3ca76449300e4708c5ee8c13951e72c8343b8c0ae7587d2470c485e7320e7ef70bf806caa2530217d525ca72a95f046ad5a1576d5fdd69a971969"; + sha512 = "bde801d0f4db8007f7bb766c17f47025672214fd7fda38858eb01317db1d0daf8a8a341cac91af096a376296c749cd109b9dbf40057b282e32f50f1dc0bb0319"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/el/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/el/firefox-78.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "08334bae31f5ca6da017fc93889303d93f39be6d27bd79031e5f4f01038d78caced4ed5f407730d3c48b2094cb40448906f53f190415830d91bf7dda1463fbd7"; + sha512 = "46c2b468506ec594fca4094b37a4512701a400e61ca962254b9df033652ae2fddb4e06641efcb306b0a266ad798a8035e1206d9a15020e9903a30669a20683f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-CA/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/en-CA/firefox-78.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "054fe82f776c2b38175ce2ea6acc10f81c2e9f9ce3e6f96f49cd8d0521d447d26386384327011d0f7879e58a3af81c93b7f227ad4b5385fb8903ea29c28cb1ca"; + sha512 = "fe50154a835122b28599f692d69bcfe2110a526baddb44f86a813019b7651b8e7534c3bbfa0a4354f53264a71b103c71aea9dc0fcdae32e1bee1dd0b5394b7b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-GB/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/en-GB/firefox-78.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "82e9e546f77e94d4f91eac13b9f1600bcbbe05a250c6049693489ca46c93a3ccfc791879123f1b49c82ba83c9f472e8f6f3d00f50794cc491a99d756ee9eff22"; + sha512 = "79f14b842022dd3fdcf0a74bb7c33719bea2e3b95331c49e624bde4f21568c11fc56566102aa4d567f7076f8f8dd08c7c038393cde5bed65d94ceeb568a4d488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/en-US/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/en-US/firefox-78.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f8e5e352b94e9ff12c86f2b2d189c88b6e1c24cd912e3777eb256403e691c0a28e860c22e098d8a3b4c5d526580db2da2deb408f1e8bdea91deda5dd8cb94e9d"; + sha512 = "3a938275cff2f55fe93bc9587e08410b5d9e70a926291f124e8f7c679a40dd944303c80877f0e70d6b273690cc101da25643849746f207532f646e4b43894e34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/eo/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/eo/firefox-78.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "c6a806f7b7655861c1e44837e6b116c70d64a158e5f38c13179d52230d1bad34121c04865959d0608f6a3193bbd55fe081d2b6b3f9ffe9c9a41a1ea8c24d63ce"; + sha512 = "97d1e61ae3ad39b531cc4309a43de654ff0eade822c1c264b9af4aaed889dd8251542a189c8fe6b4db527c1b175934bd7a2ad805becd4ef2319c2370b1e275ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-AR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/es-AR/firefox-78.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "c894fbce700c17200eee40d35fe423dfb19f5e4703b1bbf39925e4fae85e094eb5124b8dcd1e8f09f57e73be4793a92af32018b385bff09f7d111f8da06517ec"; + sha512 = "0e7ca3c44f5e3ad4d32fade1a36bc2798b635f8a18681875987e88140b7ced48bd1e18eebf1c6ed2be8f5b67f618b5ffb439223d6c17e72c334a32f2f2cf1a33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-CL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/es-CL/firefox-78.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9896a7b6a72632a42b68e4bf0effb25b0882cbf1571c782045de452a5e58608b41fcd2027cec5677d31a454f6bc82b8104df7490bf1c4b1b05a36aa170fd2e7f"; + sha512 = "bfaf1530b0e283a4c68482c4f0342bd11a2feeb66b925ebe796b0306e5084ff563ecdbdf3e7dd35bf3a14160fd6b5cf2dba2d71a19eadd22ed3d7d59d07da976"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-ES/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/es-ES/firefox-78.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "4708a94835a987f040e27342d73adde1094de3824ae444d124f2e02223de5f4bc280fbd954631eaff8f17d839896c02050c78e00dd54b4a166f291faecedf1a8"; + sha512 = "4a4a48cca77a128bd37ab09c6fc16592ce1f7b6ef15dbb140366a8ea97784c28b65a40cb65ca396df1e8b725de1250ce6ab030516a5fc6cc8aaadaa304af1349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/es-MX/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/es-MX/firefox-78.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "430c0ea67e09e36b5736f039995b3f6ee4a7bc83327366acf34cf2ac11d79c49d37a336b9b0a39a61381fb4d9c47b0908f25b4f303fa4b21242fc46749498c17"; + sha512 = "e28b793f6510c61477af82191325f047ba4b66059c64b5ddd9d73dcbc3d9d01f93082907619daf05a44512733d91dbb6aff43663ef00a4d413fcca5bf34fb53a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/et/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/et/firefox-78.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "e200e5b679a45d6a03784373861a7e78151289888f05561c9f58f4afd9cec36df5df85865d790483989b23435c1d762e8020863d0f3dd6e02f3fca31fbf642f6"; + sha512 = "b0538fcb7ec47abf24724b06172c70cde39d68e37c8863510e40c75c0464c7a46501b14c8d27a7b72219a5d91e31ddbfae5dba04af1d0915e732e461e14402fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/eu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/eu/firefox-78.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d7d5355aa60043fe759a86134bba37fb99ccea19978b0c56298f1acd465e5ec53d50761671e2636c535cdc6003fa82f8e99027969d254a3f0003995ba7db995f"; + sha512 = "b5babbd93dda80860eccd4651dbbc249095658140336a419a8165adcc8a8e1001ac07f6d1b3ed1bb17bcdf28c83ec5bab2f2df2fcbf82cd5f4d9761b1c521489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fa/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/fa/firefox-78.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fb174f97e2e21f6ba70fa8eab316a445a0c01a32fb00237790cddd4e6a32e461e89977238a47317ef2c11268d75ea34e84ecf96eac346661da6a4e7fd1509666"; + sha512 = "649287a74c1fb1c309d3e4f58b5ee8492c194e4f00334f11db2be9c14706cbf02affa320eb81729a4486a3433473c086b3cfc97040dd1f2ab60a30a2978d75f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ff/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ff/firefox-78.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "d453cd657ce54da24179b74723e2e0c793d6253f31bcfab914ce5cce9992266a3533b0358f53ee17aac0b1e616bc9c5c2d32112a514ac85061da61bd7b8a425e"; + sha512 = "aaaccb7b4ed53d1e5d2805e45fd49b2e8f1d505b358c271c5d12dad5f28c53f749a944c98078163a3200d0026aa5417af642c64a85565f5dfc875795266b0035"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/fi/firefox-78.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ddd65dbe5e8a9cc59b1c44b40b0f836d56b1042b5a2a37fd021166929485fe013acd14ac59f0c985b6a691b1ccd8b62f5d0bbe89ba341c414003e73fbe839546"; + sha512 = "8ccdecd8866b78c03ec26681abc381158a223ad4a60372ac31f5e8d5f920b8208dd58190f20b77e22d0f34e72caaf5aea35893781b1bfa14620a6146ab8cade1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/fr/firefox-78.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5473918598bad367a0f8cc71f50b54c899fc6ff015c78884040c09f558e0a80508dd104112b9ebfa92b8fe5f328262fb2c784dc8726c588ac84e41bcff95f943"; + sha512 = "00d5e0d1f85e2ef9622fbe85025ee17594239ec9bf7bcd879fdb504370ecd684233f67c1f51973cc75caa9f3dfadde6fa9bb5598083dc5d1cf167e5f286cab2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/fy-NL/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/fy-NL/firefox-78.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5e49d9d3a9aaace6192a838697ce0220ec347b93c0896dcd1cc46f97cee9a7835aae967d4413d71770feaf917eb984a5547d1dd5b6587baff7bb895e5c2fadbf"; + sha512 = "9428a12bba33d6d872f93dc805b17cd8b344e2b90d3d57044dece426af04a473c84f1c29a23e501736402c8d5957122887e8cae3f0f009c64df70ecd3fa8e6fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ga-IE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ga-IE/firefox-78.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "84b39f6aa3f9845d2d34ce089eddfbaad0c914a21bf68dc64e649a358739eff111e3809e48d882de0980b96537472e90b922ed2bb17a340e92000f0fedd17b4d"; + sha512 = "3d78dae93c08ef2795281f12691d0fbfe43d2ef0547c106e28bbf61362f87cc7b4fe9d144a6eda9fa1cf30372ebb403681482afa4185bb518ef7bee726230d1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gd/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/gd/firefox-78.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "88657692e941513807522e7513f480915f2f40278ed3ba36855a03e47879eea2c17d48bb626543e71a19eebd7b554d797f522b499066e7a52f8a4363c8987a44"; + sha512 = "1330c5d0c7c2074269993d93f40a512570e6858e76171a5299624c6e6b91e12b25aba5e83830a4b8b5d6252e8e0d8bf906ecac93b4ef5d0905284a0c4fe5d8b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/gl/firefox-78.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "21cd90d9e5010ee858fd5b499b64cb1b0a695ea04c7551fff884e426895bf80e041244a5a27ca4e37a6a283b9058723b9b62ade273446a5ec9b0f5055c612a6b"; + sha512 = "b43421162c4ef0dfa21331d5e2ba670ce2fb3d5fca86dccafde72f789bfc86765ccd61f9cfff5b436209107db1e4ebd0f1aef7fcb700c3c0febf7ed59b59e536"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/gn/firefox-78.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "23ad0e28b4d5bf1e83983e3b498d78019b78f821f17cb9c1e9b18a2f98b4c044ee25ec2de8ca43381366344010c81979c6f568ef9ccd70cf67bb933789b96179"; + sha512 = "c49fd8637ab6a809f343317187c719badf84e626e5e9d7cfb2113a78b9afb1fef770fa4ede000b7fade3302601c3fc9d35ceca4f9703dad9d6c2fb8c17dffd29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/gu-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/gu-IN/firefox-78.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "6914fe4888f878904eced34e13392dfef90b313c4b66fbcdbdd02070b62a8b12a397267012267551f8ea36e826912e26e5563d0f2d8c320589ad7c572786316f"; + sha512 = "8eea7b1ca7de041ca4e8aaf25c23b8853008c1fccbc57ffb802a835bba327d7913927e43f1a6a5c11951d9655c3b781be35aab636f8ce10874d0b4f1235993f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/he/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/he/firefox-78.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "453bd36930e6749afc97dc995565d72dcc8e1196d719b8ef3eba080796392297d698e439a2ffbe2c388dc78c7296baf40e2a02e539651f1c1b8bc62f9a294226"; + sha512 = "d39d794bcdf93717af61d9a1e261d0115aac83762da2120a6f3cda5ed89611207b8f2815486f96b8e420f80f6454fdacc934f49985f7bd0635f50290bc37b451"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hi-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/hi-IN/firefox-78.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "67570140e8087e721ca4951fc7f8845164f6d6a6ac2bf7cbb84c2cdfc522bc1c8578a11154207097893b3556b415ee2724403ea377a59d2bca53bf1cadb78895"; + sha512 = "ed235949d9f14918d8f034089550724ee2996dd6d32b77c654d270d96831f175f92355f94daa31a38a7f0ca3d677abe539f9da3a3c5b99208db9287cd396b751"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/hr/firefox-78.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "949d494a971d4abb4a0a7f41d994758cae50ede8db4be8c240382ee2f33b21e383bf9fe9ee53a1f767960c5c01005285f899f4c575e734dccd2ab95f6fbcbe73"; + sha512 = "c67482d9d48ef9d0c5ba607d045d57378e27b7dcb3f15162534d1420743d784aa2ffd7adf119fd397c09aed1ae91978d737a1d1f0ce22bdc43221d9f52295ac2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hsb/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/hsb/firefox-78.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "5987ac4a7b8ff18604de100f2dd5099d3f7b4217e1d921e3804a86b340686188761eee33240d8416aa6ec7cc538026039082953df34d2978d30992bd451c8e53"; + sha512 = "d50ba1e4665b01584bc65b1ede0d7bf072b1b0a6118879bef51da0fe49b2a75971ff9dd175edc9f1ba9fecc95d571bc5c014b8c106a7dc0bfb2b258392b96ce6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hu/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/hu/firefox-78.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "438344b07b4f788496de76cf361db5b8a8d43b71dbaabf025f05b24bb47f0fad17d93d683743a0a7673727339324d82196053e67eadccff901c5ad02b45b15bd"; + sha512 = "5f5a6ec0f9df0a8d0cb6dd19e9e92ad581c9c1b63cb97247741085a5fa39d0599ee57baac86d444b1a887d7ab4d4d56df3ea6fda93582260c625c5a0a702da14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/hy-AM/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/hy-AM/firefox-78.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "123f20b8b235009474b3b7e3d57619131a4f607dbd600ae23bb52a8f726c458a23356fc12929fb0557da96c9eca489ac8b87909b43d2f0bf4024b8a306e99148"; + sha512 = "fbb9a35823c8e1277fa3f602adbf456e9b0d49e9a5c4ebc6857ab11fff271a7e352fdb9ee2ef2df96715b1e012302cc6f445722fb8c54c682a1c2c43ea89d749"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ia/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ia/firefox-78.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "afcc7cf79d5d8f023699d6a9d2c35897329a9372f5161f28188b75126f5b843d105e50bc49968a7ec8acdb290ecfab5ab06731d7b002d2721c0161cd46dcd01b"; + sha512 = "08b21692cf897f89a3a20b23ca1c0ccddd7c6f5d507b0296d6e7ff7e3b4993dd1263740181bdde72549bacf0f25294fe448215dfc6c423edc764c27027877845"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/id/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/id/firefox-78.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "3b505e26ba7fb53c27aee55dd47771abe2e16ddce33413cf61d21d757be2f9744b7e406294ed86a95f2ed645c73efca2714e405a6b0947e08e19f3c667f886ad"; + sha512 = "0d194d912519549a6d578ae523b5f0448fe520893c8b04ca2fd03731f152b2324670c134e879c671600c8577ab1fcaad54866c3bb30b24e88b94fa00988cf007"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/is/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/is/firefox-78.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "7444d0cd5ab0f667a46f6e6ce685102a4a3940d422c671bcbe4c454333714dd17e2b6784cd3d865ff13fe9b5fd63c6bdff79a17188038baa2b558d0764f31d10"; + sha512 = "ff2890e5843e56c007f6fc500cc0da09e2132d897f290e6710b0e0df96b35048095a413ffea276de213e50a55e7971484b6e915e53fac51e00381f4570f85ea6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/it/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/it/firefox-78.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "675f81a6a7266855ff6ebb8effa0646b3bf48da50246bc4aafcaf35aab52be107df98767e51f3aafdee7ad7b866f7304c859aabf9039ce08ab601df8f3aaebf5"; + sha512 = "4cdece1e9782f45cfecb8a4325d391332b71a6c044608162c40b322248641cc9ea231fd8e85d247e2ab01191737702d797dbf73d565bdac975e13b755d718dda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ja/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ja/firefox-78.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "296f7a8ebe0e685e854d5f2674af347c2c3dbe0735bc763cbb1b12ed7862cc44592795b0cd1b01030e36b3c933e3e5cdd6288e77283633655c60182f1b91b0d4"; + sha512 = "4e12d8803fa2453082c6a132edf1d3599bf242cf4f76dcb1b65f26f5cf7b4e1f619f7b8b2c35c849a72c5fb4aaeb9d87da8ecf1dd4f74e7e79f656daa0616eca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ka/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ka/firefox-78.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "514409c1bebc87ac575edc28d461d165e64779e95e54a27f83b0f9194d86d7c3473b29e34c2666e4f9ee04a0365e963c0ad54dd0d34b979b0d444c2059d3681e"; + sha512 = "d3539c501a693bdb1efa153df5d50e8db7d8395152bad41d4f13c710c7169e82d8497a714cf27d8c118fb205036d476d7cbe1d8cd25194a963a0fa33ff67e3ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kab/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/kab/firefox-78.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d53d3b7fd5cfa7c96ddc528ae531d111998c95e8ddf0fb44a5e3e55f3223492680acf87590d1fb4d26278604eda2ed48b8681cd62a398a779ff76429df7bdb5e"; + sha512 = "e2db664a5a7e8a95472c90d2e5e3f2b9d67fbc28f48cfa219b6ababd4f6bdd334f25933128ce628d485ff2580955eb1c20ac26bba5c963f0b8e6fdf92be6304e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/kk/firefox-78.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "8a9fb7e5070ee73dc8d87935cf0d328616ddeb67f1f3955678cbcec6e240ec375117daca8a574f4379677959e7acd30efb65114e4941ffd204c3cfdbb848c570"; + sha512 = "d26b381779d3cb5c71fa0b27dc46d31a272d7b5633a9573297be571325f6a0dfac35a1d87ec407db20c82f6fb4f8d5154acb0c2619a8d0070a88cd4aa7f6ec49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/km/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/km/firefox-78.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "754254377c41865d6a5aa8f2e338353987885a6e54a7738c36b1566249a0b3becce3bcca9419905be64d935d97a90b3108f0020a313621c64cfdc568f663cc2c"; + sha512 = "e672dd56f878548a611b567efed4024abbe9acaaee21fdf74ba4983e2f7c7373f0ac3a6dac2a21c92573693df86507b2daa53b43467fb491d756875fce486487"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/kn/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/kn/firefox-78.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "79cb8cb3f8daacd1015a2d23b8cab568f9622396a983cbf1a3c6e231929d8bcc40ba84ba2787c9b60a1c9bdbb0729e2637ff3bfc87501bb0e156ff29c3a98148"; + sha512 = "2f5fa29c9c4dec0ac88c4b3a43cd442f929e42c8329f33f5ea2e5b1662aae6405cfbde31f590bb9fa55c101684aed12de9452a98bf7234d95fde534125346b6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ko/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ko/firefox-78.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "262a471319ecd41cfced36e353dd32f22c1aa79224198d203ed029d21f858bf283db75b33f3af7abc48cf3a995d7ed90d75701d70e371c8a937d6259ef50e7ca"; + sha512 = "315caf9b980be6b1c63054d476fb0eb44cafb3c11e9812c376e3536ad08ae44577fc4647d74a99a4df32cdadca0c551953b48d15ac10e1c0c81ab597e4f2d595"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lij/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/lij/firefox-78.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "59b93c56ebe8022ac3ff72acec539639cf290c0339e825a27e6fe0a6e85ae02c6c4ac62ac056ade775eddf0462131e2c7cff99639c1626f2a6d979d2d340ed6d"; + sha512 = "d1b2fcc0660813869087835abd6fe68f02e7375e3e6b1664b59636fb51eda8d3395b66882f7532d386999fdba30ebb836f100a0e17bf20ff8223b58e05d3ea60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lt/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/lt/firefox-78.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "7578bf3f0d9428345d0d5f16c1cf6557d6fc0962382df1359e9a2c3b94feb3ef279266635da41cca1a90660640b0d5c0d20a415130a860aade0ab554b6fc8415"; + sha512 = "f4e3e7ec38ce488591049e7d09978bdae9acefb64e747bec94c25b00c3a56dee45d5dc13569fdf5110812ed2ac9bbcedf0101c5ad429de3d0c68c5d7d2b72d60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/lv/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/lv/firefox-78.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "610f14f6e3ddc8b2f732e40e79ad07e40e5cedc2e92dcab6b39b3b3895970d9c82749f4af90f034b7431191faef6bb0f61e230a3374efae7c5715e096048878f"; + sha512 = "e696c69ebc27fafbe899afb1eb84e30105f6d3b373d7d014ed8cba9b2ff53ba23c3427a4c684dbc9f6adc2fd9813989c8e16254d015c577be09e8f61c6d9a469"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/mk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/mk/firefox-78.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "cfddb67634a2e05d41c3595f62b88e53c05f5b07973ed16128f7620cabc9422a8f028458118e404148a2f5187fd0209910be1d5fede135caea25a2ee076811bc"; + sha512 = "bb08fc439b7c0aafeac6061d7f9e179b2bbdb8fba0b732e222e1043b9d4972440f4c966a9dea0cee2cb2e5c632e264bed648816f479df27f63de8bac06a5c2f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/mr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/mr/firefox-78.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "5bb458faf0495b24600395250f8800587f6cff04d46437fdfef4dfd1fc240c7c9bcc49f6679258bb761f587b2c8115f0bbb6ef5c0b11421b79cf8d534e70c8ea"; + sha512 = "9715d7d245ea077185e0c375be8b3bbb51989728786ed30d8bd770c236a7cd2cd93ec3b4a15c1e946a82ce645fb9c0a3543c692c992b7c22fc9d506c2fabb5d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ms/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ms/firefox-78.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0e509780c72eb1d6154e3b3d804ca434be340f6fe8e706b87e2fd9e00aff3b82002a8b1a2f5d6994da2b566f5678f1b489e3b116af95776b323da7f5f674ea17"; + sha512 = "1b99814dd1b8c6c29d1d769622961bfb4f08d0d92ce6e452018423ad5104480f2863c66cab1baf3412bda94561073114d81de17b9d951b4c533ffe0f18350d94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/my/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/my/firefox-78.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "2a036f00f40e98a5dade0d380e416f869d0c42f4004878dd1a51e99386a118cd88ad603915b741e91e16a7bedc0db9029d8627037e17f275c74736cdd69375f8"; + sha512 = "8c596041d2271dad2b015da82689ff4ffc77ccf351a5ab4acb31ce568f6953595078908ca9fef133fdd958832771969031788b8e0aa10d01d9908bcf522a8622"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nb-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/nb-NO/firefox-78.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f289ad816331cebb6634def4c7faf5ff6d1c6000cf5677502027a7823c34becca72a0cec5bbb13d5c4c16ca22fd87da941d0569b47369e1cf5ce00cbad326693"; + sha512 = "17be021c57da49533552302cef3bd99d03e9876789e81ffcada592969e525007295eb8f49494466ec0c160b9268aa93339ecd3e91c30e8d84dcd2ec5cce83572"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ne-NP/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ne-NP/firefox-78.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6084544df0c3f45562a3bd380386217c4a4a6cd4968159006e3c24ece9cf6c178731c4e8fb0466ddf484776ec533e838e24018ed3d41bc5f54d9757081a963cd"; + sha512 = "189c42a7904e2a2b4f21a85e534db04b81d0ffcc159854029b8a8e2df99432e7bb64399294b7556e675b6194191d7fae3e5f286ea3a4f4788a46e246167486a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/nl/firefox-78.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1d31ffd4e7e9cbf728d552cc1cf6692037f62884cd396ce5ff3c96f89096d44a9fd789ecffef1516cdc0d66413a30ce67daffaff224854dfab2e9a3fa37e6150"; + sha512 = "5a8aab4aaf2a9f750939d4609cc02248069c4455c9664286e21072387deb2ec863faf2d869bf40de1f1a82ba4aae726c7219596883c34f416433731a6c960dda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/nn-NO/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/nn-NO/firefox-78.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0f97a3a2807b1087e1569e0f31cd80ef2995b89c69743c3441ad974a5786b789793c94828935027cd45f52b738a28dfdf86b1e95c5026d34de2e1f20107bf784"; + sha512 = "fca06c7a517833914d746509330b874c55a2b294fd450aae483a2ae3021f4914383a5bf54f5e8bf22a3e41e57231a9292be155106f665c0f703b023e4ba9b24b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/oc/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/oc/firefox-78.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "91f5dd7f7c4ac97bde1235e9bf9594623f531a5558ed06d5ba61fe8cd584d80e6b01fdb070fe53b7c702893b2689fcdfedabd28c440ff865decbe4119bf4ef06"; + sha512 = "3dfc063b14f27d2c24fcf997bc6dcac470bee5e01cc6b3c735318ae29284b8606e5cc32b4dd683a269821e969ce77e8cd8a2f4155d2138d91cbf1ca864c2da08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pa-IN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/pa-IN/firefox-78.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "763e900df5673e5f88fd326ff6ced28502ebdf09001fa06fa37912317bab9d0ab6c737233baf8d644de286766a7d4dfe740242ab70fe938c0c3bbcaa1aa1b314"; + sha512 = "155b1f5091183c3bd9f44903f835abd5cb153936510e8b4bd818ea744f5e2deebde29f59d8b6784f5f99ec6044317312515f6174f058a6ec69889a3900d150d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/pl/firefox-78.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "1aeb0dff591ad21dd506da2cc89d7082044b762e7c987e364631cb6f28bb07618d51d138d9d7a936f244841cc4f5208dfb9bf8dcd1ee0d839fca5e6e58823c1d"; + sha512 = "01fc29cbd4a0469119946878b654fe34d9ec31ece166f1eaf3c06615dde144f73ef8c4d4a4617ca1d605f124dc3ee1b96c9b95e5bf0c6c6706946de2b168857b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pt-BR/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/pt-BR/firefox-78.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "643a666005cfcb726a18dcd81c8af6d3fefb77861c2a4db884227044c39d907659f1b2abe640950c4cf31ff3552d4d12a52fd9e7527637a68543aecd93a61763"; + sha512 = "62b1d24edb249a7418e74aea598d72e674ad528d240a0c70d775eb8922dafa75bcae6ce178a3a92211f706a1b1b5bd788011a8e47820bec7d4f04d3b610f1819"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/pt-PT/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/pt-PT/firefox-78.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f17fff22865d6e64ba77069012072d24ab79abdf783652337a7dae7d9a901569f00f9d3cd20c2e3a268fc81188b478b9036229dfa248bd5b1ddd7a0f9c7b7201"; + sha512 = "6a534951d73d8942e84e1301cbe5f0f5ff60f0317c9e1ef5fcf3283d37fc440d44c9373c821df1bf020ddf62c5ae9e7f7b81bb75d5e21b767d480854457baa74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/rm/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/rm/firefox-78.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3e105652654c1691bdbf8ab51f20f4ebb9b62d6a6d09f0f6527079bbc1f5832f4170800e6b200c00dd43f62dde531e7e8bd6bebd0ce27fd058552672d423a967"; + sha512 = "cbae337ee14f03731991b1c0d64a4e31c9a8ed6b98df3636e71fd11550997dd84699ccede05f9410e7c120716260ba0a208dee830d4e13c4ead9e9843ffa8fe5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ro/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ro/firefox-78.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5062a90cc4712f30c9dc428d8ccbfe3bc1d0a50de3e84b5c475fbfbabad09394219fcb03db9313d7773518e24e5eb5b41dc16723ee235a87677dd07bdb1e975b"; + sha512 = "0fcf28c2fd8fde5ae76e34318b4a792cab936c4425ccfd4ee140952c976d2c7b46fff984ef457187065b232e44bdd6e229ecd44f14712b1de44bccfee3f44f3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ru/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ru/firefox-78.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "5b457059285c31381a03b9e0285874989cbf93cb264a74ee875ec9e120027d5bd921a666a95275c56631ebbe3f435764890852ba25d199b0c8c8258d5b8a5807"; + sha512 = "280b8e19652593654d01bcfa561d432a9efe1b4ab3801801c0036684d1a4bea37cb0617c6f434fd9ef80c7b5ebee42b8f95588e9b14cf938960229e326a2fb2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/si/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/si/firefox-78.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "4f8ec721ae19da2466a31e363ecdd9743f90a597d0bcfba12c12120207545ed03685a552515c9fc1deb27e79dac41345b8c87efc025dddef6c0347d21c2809a2"; + sha512 = "d4d077be6af067603f8347a49cdcbcbcff6d686e4bc1016f8edb72dc001ee8893269577cac173df62a742f0575952e58a41d602e4d7805d148a06d91b99605c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/sk/firefox-78.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4953e879c353d7a9a71e517454ffdd793546d5c863676ffae3a1bc725000b5f69f0f74fdb9ba979fc54d809d576918e6def88ec1b1b7a81cdb6d1dffab624093"; + sha512 = "d61d1d54c2b3d88adc21729c91f2e1cd0b7f73501c6cf29df75a00cf48ab17200a55e231e5e308162f2f28f71f16143ba2ee81959b626d974fbe460e9e0008c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/sl/firefox-78.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ce930f05f2a6f3716ff54a71af907cfafb1398d4f86999e8b161771197c60260abf82d0431093ecd8894d2de2aabc317ee5b6f348d8c05f3a823ac706bce0b2c"; + sha512 = "39de7a12cf2ac933d94673793928ff0a26fbde3e338135c3ba9faed52844a1fbde736dde5ed8c5893aaefcc9eed4f2109fd0192e85b0985bf9abd805aad80107"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/son/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/son/firefox-78.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "1862101ca5ae8d8e2543f55e6b283dc8f935eacf38dece8c0e1b62a0cf83342065b467ab001a9709dc25f305294506f84a1036ce618bd7d47ed8d60f89b838db"; + sha512 = "6dcdbcf0ec715df1ce509e545f4c3bf99eac749d3c482d219408d840b422629e6f500f69d6a59b8c5bf4e8f814230dbd36b47ecceb38b18ef95eca46559add83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sq/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/sq/firefox-78.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "511b7f3dba5083414d62090ff1202599d8b6d4623df06d8749c0bae2c18249b3370af71eacb87b77711982a196fac380f982c55156b2bc589572796607128763"; + sha512 = "ad22a16e72c504ceb532e463752b121523ae2c74b89bc38b249d20c2f79b432ebf56a1ce7daa52a7c86ea7bd60d8ef821008503bc0bde17c9f078e9cbfe17d56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/sr/firefox-78.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "372420a6a308e94a438b9b220a268264f3dbb0c45ebf5053fb0826948fb6f5e0598567f2e237a4c753431a135274a9867fb8d092f1abc3b90900039fa2be5322"; + sha512 = "c20305d2fd5bd21d877af5a0c30151073a14c032ce63e0c7673cf074e508c894d2190f4b5b468b9f15452ecc2facb762915c1e4083dc513792540b986c3517ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/sv-SE/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/sv-SE/firefox-78.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "cab258cbae1aff73f16f4be2217274f0be2e82bd587ffa45846308b90d0bac043953828706fb3ad33e33d06ca4eba6d0fb4d96caa684dd18f9fc96a33e1b8445"; + sha512 = "1705c465a304e4d9915149f7dd8095e54f232cc81e184c2f69c423208ec7e2d65371a827d4b19741f459b1223414cba93c0176c45e42e7cc0d9d5cb4340a53a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ta/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ta/firefox-78.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "dad1630c0fea645199cf5577d3928cdb06bea5bd718d4da4ab27b194aa5068107b0bcf433ac530c53050137a42b700834fc30a778834885976c090a9a6817840"; + sha512 = "a77771a10da7188ca198bd8882f435522c9643974917ab316e4ba3a53411e1f00dc3c445f33692b484efabbb66cd43de9ef2d08ecc36c91c0dcd9bee228394bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/te/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/te/firefox-78.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "7b903192af9e954b8b595e6f7eb7b176fa7fa91dad3891f364c676e0627a5eb7426b1f676c522943eda22565d459d049a5e10b2584e65b1e1fdf7bc27a7c2aa9"; + sha512 = "4eedb898f0caa692c7b525d8a33ae784a345b912ac4ab4b26168c701a4bdeb4086706cf5b71b75d9977ab09e659a17264565bfe5a613ff49d7581a3ecc1ecb3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/th/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/th/firefox-78.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "5ddba062f7ed0de1b9b7782ad34acc32762ec5b4a33cbb3805eda39ac667d239ad23bf81777b8ea0d9dbf82d688c9a2fb273c635b4d44cd7afbe887a16c34ee6"; + sha512 = "ed09925c67dc0a840ef3beb467d849cc0c6644e77e0f21e5349e66d6152034dff755de4753103e7e1cf86d41f783c30775e8b66f9d56933be81bf44d2ec5151c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/tl/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/tl/firefox-78.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "8f78278bd75240622edf86bcfef0563d51d671a7b7731195b698f3e6baf2e467c0864ddbafe38fa7728ff00c4ae059f2e60c1cf67a81772445639cfb75fddf04"; + sha512 = "0c73908dad03020b85f64a449c00583dad4accb0d787df1c52013cbd29078490b7a8aa08efc415a2749adeb7c08e5cf9bf7ccb2cee6c5bbe287a18be05f01dcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/tr/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/tr/firefox-78.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "20081f6fd914bdfa14ddf0a7896986290f3e7f35d7c77c90448be53a0ae09c5697b37ff8b63a0138ae20327d110a1eda2bcb5a41ce1927e36eb222795fb492f3"; + sha512 = "90aeeb66a737f1110fc2c1a1f281bd5ab4df4a1fc1698e760e2e43f845a4c428718f2b22017e3f205defff667912bac6ff4bb17c7e88d93e1590223b5f522c8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/trs/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/trs/firefox-78.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "023b6a4cc9069ba73e0072c8e4ef8d782b4e8cbbd9ab4810c921998d6eb87f8d631fe8e62771f8c3e5b0da83f43aac8a7d569a8309603e75b984b4233dd7b652"; + sha512 = "b74b39a162ac8f0aefcec575129f7764865e14616fa5e64afc93fc4f3e400a455287b8f677f88e03c198911dd62a97eb31f4c5501b640e99ac5026a2c05b789c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/uk/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/uk/firefox-78.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5d9774938c64271ccd14a498151436feb8ac3a2b46f8f093c7c11bc84b7f49ec559acd620ed0c4e1d76b6f466f8be5d19d64af4d84606c12271814cca88801fb"; + sha512 = "ae5ae2afd758994c414b59bb65feaed73598590b4b5e14add28d0abaa9c5f82cafc238bdf41f3f12aee34482bb5fd18ed6de075b19b81d38fba7aa413cc277c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/ur/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/ur/firefox-78.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "73aecd84a201e7047ebddc71695cfbddcff8d7866f1ed1299217bfb81c49865ce4140deaf0d3d0ca34f82bfeb1e3598059f299f163e816fc4f85bf0a1b8d93c5"; + sha512 = "9a19cd8e3711c025675d5a189a12b0b9b6da1dcd0d0c05900fb255b85a43f301eb51652401239e7260dba78cc6f9ee0fdf42f5e9eb4e293e6058a2a04c53e3ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/uz/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/uz/firefox-78.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0b0a0f8bcc7a96222ab09c113b537b2e56d1ae38f198c9a0efd0a7defe917aae30b64b81047b404e09953146ca78588e8184127d1ec86ed05c642a8f03b0478d"; + sha512 = "0d31dc646fcdaa09e6c07f9ac446f4d7ea0c4a49d441aa9c375e9a6242542e6097f78bcea0429677f61d9fcab785ebd559bc38217f6c0577b08ebdf881d9776a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/vi/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/vi/firefox-78.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "2b41d980f54907cf4f84ac5159ecf3d0b4ee4d6ff0003d2d26cf8ef51befbb67410c99eb75bfdba3f8afbc64c1911011946cc8ad23ec7f514982d522857a8304"; + sha512 = "bf580d0527319fcb770936f3ed188e0599f1c5525c9f23328abf6ed9c9bde3b6eaf426fcef7683f5dee508ad0beec1892ffb58dc6c3437015a94d98f5da2d868"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/xh/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/xh/firefox-78.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9f07d1b5b54ccd5764aab35df797ef866cb6dfc705bb6db0337168eb0453d847d6068230ddd00368ef27f3f58300f8009c9848a9ad1dc3a459d90889e2f7c5aa"; + sha512 = "3aa35017a33c258d3056b158f7b81fd5670900cf2855fc628331efd8fc14a42319f1cc1547b550f86c8354d7c6f6909e106489bec6158801c1059fde4ab7f371"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/zh-CN/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/zh-CN/firefox-78.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "1a5c6b1abab116fb0cf3e98e50024070c894e64334a82a3cff7c3a755b72a0ff8992f3a4c631cbb5489e2c03b5cd5dc5918dad56d5818c6050eab32335bf347b"; + sha512 = "a6b7b634bf0541a165a93136ee40e47c7451c2d9d87df9da6ecffb6f95bbae243888553ee4bf8c7b94832c8e0e8c1c2efb383218dbdca1b79ef96efe8d5a826a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b7/linux-i686/zh-TW/firefox-77.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/78.0b9/linux-i686/zh-TW/firefox-78.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0b16ba221c9c681e44bcb8ab6ebcbc0698dc8ecdcf31d14b9b4818afd396fa8608b389cedd372d15dfd833e4e7e028dadc7087af21c4c2d423fd97e1d2c0030f"; + sha512 = "e85a01fa2431aad8a312b4b3294528cc283e91de87d785fd4f30b0fb785b00c5f1265388232b14237e530c376cbc270e2a71f98847efde6965b59c6bc83aada8"; } ]; } From dcd48593e845c1565251ca9fd2aa43891f2b3748 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 25 Jun 2020 06:02:59 -0700 Subject: [PATCH 615/624] hugo: 0.72.0 -> 0.73.0 --- pkgs/applications/misc/hugo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index ba01f88cc58f..d80526d66fe7 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.72.0"; + version = "0.73.0"; buildInputs = [ libsass ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "05parzx0wm51z4qkvh4k096ykgiyr9i5xy55c0g99j4y96drcybb"; + sha256 = "0qhv8kdv5k1xfk6106lxvsz7f92k7w6wk05ngz7qxbkb6zkcnshw"; }; golibsass = fetchFromGitHub { From 1d805c99bd3af1d3b476cba99c2819aceb8aaca4 Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Thu, 25 Jun 2020 15:41:31 +0200 Subject: [PATCH 616/624] php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7 Point releases contain several security updates and bugfixes. Changelog: https://www.php.net/ChangeLog-7.php#7.4.7 Fixes #88381 --- pkgs/development/interpreters/php/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b56824c77238..78a3e91179f9 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -264,24 +264,24 @@ let }; php72base = callPackage generic (_args // { - version = "7.2.29"; - sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; + version = "7.2.31"; + sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }); php73base = callPackage generic (_args // { - version = "7.3.16"; - sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; + version = "7.3.19"; + sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }); php74base = callPackage generic (_args // { - version = "7.4.6"; - sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6"; + version = "7.4.7"; + sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0"; }); defaultPhpExtensions = { all, ... }: with all; ([ From 5d807cc8d79fd1999a90fc90d7c8441717c295e9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 25 Jun 2020 09:17:06 -0400 Subject: [PATCH 617/624] linux: 5.4.48 -> 5.4.49 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 006f469aa988..a20f401b80d6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.48"; + version = "5.4.49"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0lqxryxn0bfly337ddhl7m7qdwblxg8i1fsl8v9i9h84rnpxs85z"; + sha256 = "0g2psjf2q10mfc3vv6brjn6s2nkg73ll1s04gpshw907d9irpn2m"; }; } // (args.argsOverride or {})) From 06f0a0fc27f7c633ae58ff68ccd3bb8b9f0b301f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 25 Jun 2020 09:17:20 -0400 Subject: [PATCH 618/624] linux: 5.7.5 -> 5.7.6 --- pkgs/os-specific/linux/kernel/linux-5.7.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index 2f0223b59d02..e06a193be4cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.5"; + version = "5.7.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "008bpcvcdbwy3w829zc0s6ighn820nr51y24l6df5qfvah1zjdvc"; + sha256 = "1rhhys2fvfrfsc6lk0qkq59p83qhwvns4jhk0jlyylyzqqywkm4z"; }; } // (args.argsOverride or {})) From 4dd1dd56237753bfdb2519aefab67b5ec56dc97b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 25 Jun 2020 16:48:01 +0200 Subject: [PATCH 619/624] jekyll: 4.1.0 -> 4.1.1 --- .../misc/jekyll/basic/Gemfile.lock | 14 ++++---- .../applications/misc/jekyll/basic/gemset.nix | 28 +++++++-------- .../misc/jekyll/full/Gemfile.lock | 18 +++++----- pkgs/applications/misc/jekyll/full/gemset.nix | 36 +++++++++---------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 8731ed268385..86f1bf23a6b5 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.1) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -15,16 +15,16 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.12.2) + ffi (1.13.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.12.3) + html-pipeline (2.13.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) - jekyll (4.1.0) + jekyll (4.1.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -76,9 +76,9 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.19.0) + rouge (3.20.0) safe_yaml (1.0.5) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 8c1773f19dc0..e4c8a94fce4b 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; + sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; forwardable-extended = { groups = ["default"]; @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4"; + sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6"; type = "gem"; }; - version = "2.12.3"; + version = "2.13.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v01g9cwn4v7rnpsl9yvscjzvah3p4xwh03zp37zxkvw5kv004n8"; + sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r"; type = "gem"; }; - version = "4.1.0"; + version = "4.1.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -353,10 +353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; + sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic"; type = "gem"; }; - version = "3.19.0"; + version = "3.20.0"; }; safe_yaml = { groups = ["default"]; @@ -374,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 8b771bc1c0f7..9acfaaa97cd1 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.1) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -11,7 +11,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) classifier-reborn (2.2.0) fast-stemmer (~> 1.0) - coderay (1.1.2) + coderay (1.1.3) coffee-script (2.4.1) coffee-script-source execjs @@ -26,16 +26,16 @@ GEM faraday (1.0.1) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) - ffi (1.12.2) + ffi (1.13.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.12.3) + html-pipeline (2.13.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) - jekyll (4.1.0) + jekyll (4.1.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -55,7 +55,7 @@ GEM jekyll-coffeescript (2.0.0) coffee-script (~> 2.2) coffee-script-source (~> 1.12) - jekyll-feed (0.13.0) + jekyll-feed (0.14.0) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) @@ -110,9 +110,9 @@ GEM ffi (~> 1.0) rdoc (6.2.1) rexml (3.2.4) - rouge (3.19.0) + rouge (3.20.0) safe_yaml (1.0.5) - sassc (2.3.0) + sassc (2.4.0) ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 5f54a4f7382f..073f69f5b33b 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; + sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; coffee-script = { dependencies = ["coffee-script-source" "execjs"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; forwardable-extended = { groups = ["default"]; @@ -195,10 +195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5i330yks7pb1jxcbm9n6gslkgaqhyvl13d0cqxmxzkcajvb7z4"; + sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6"; type = "gem"; }; - version = "2.12.3"; + version = "2.13.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -216,10 +216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"]; @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v01g9cwn4v7rnpsl9yvscjzvah3p4xwh03zp37zxkvw5kv004n8"; + sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r"; type = "gem"; }; - version = "4.1.0"; + version = "4.1.1"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lx8nvkhd8l1wm3b6s506rycwbmpbzbsbjl65p21asjz6vbwf1ir"; + sha256 = "0fhbz5wc8cf60dwsbqcr49wygyk5qarpc7g77p6dlwq2r21nil5c"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; jekyll-gist = { dependencies = ["octokit"]; @@ -602,10 +602,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; + sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic"; type = "gem"; }; - version = "3.19.0"; + version = "3.20.0"; }; safe_yaml = { groups = ["default"]; @@ -623,10 +623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; sawyer = { dependencies = ["addressable" "faraday"]; From 8a3547afe972bffd6bb912bc22940bc8bfa80b12 Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Thu, 25 Jun 2020 11:01:07 -0400 Subject: [PATCH 620/624] maintainers/teams: add mdlayher to golang team Signed-off-by: Matt Layher --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 703a6a031d6f..671b8cf1a913 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -40,6 +40,7 @@ with lib.maintainers; { cstrahan Frostman kalbasit + mdlayher mic92 orivej rvolosatovs From 30e812c6c09e1b971dc902399f3dc39d542d89d9 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 25 Jun 2020 18:27:57 +0200 Subject: [PATCH 621/624] php7{2,3}: intl: fix aarch64 build --- pkgs/top-level/php-packages.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6394add94831..044e4f8045c5 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -3,7 +3,7 @@ , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit -, readline, rsync +, readline, rsync, fetchpatch }: let @@ -965,7 +965,13 @@ in # uwimap doesn't build on darwin. enable = (!stdenv.isDarwin); } # interbase (7.3, 7.2) - { name = "intl"; buildInputs = [ icu ]; } + { name = "intl"; + buildInputs = [ icu ]; + patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch { + url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch"; + sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; + }); + } { name = "json"; } { name = "ldap"; buildInputs = [ openldap cyrus_sasl ]; From 228cd7fbd70d1ad6c17f18273d6e25385fa14c76 Mon Sep 17 00:00:00 2001 From: Tim Zook Date: Wed, 24 Jun 2020 17:47:58 -0500 Subject: [PATCH 622/624] sublime-merge-dev: 2011 -> 2022 --- .../applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index a8fb944319cc..7a0c0d1f1edd 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2011"; - sha256 = "0r5qqappaiicc4srk08az2vx42m7b6a75yn2ji5pv4w4085hlrzp"; + buildVersion = "2022"; + sha256 = "0fhxz6nx24wbspn7vfli3pvfv6fdbd591m619pvivig3scpidj61"; dev = true; } {}; } From cb605536649739792282663e7a4645361b2bb924 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 25 Jun 2020 10:18:25 -0700 Subject: [PATCH 623/624] grafana: 7.0.3 -> 7.0.4 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index cb1bff7ba88f..293592fc8dce 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.0.3"; + version = "7.0.4"; excludedPackages = [ "release_publisher" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1s5hq7icfnaiq7msk7vdz30wdhw13s115vg8ws7gqv5sl1hi0vlg"; + sha256 = "16vdbxq9vhv71jjk689xx0nn3qr4s5ybzbp41dm09pppvxzibpg7"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1wk991nvm6a18mah37dh0sdi72gdshpzdi367v7fpz2b9vd65b4g"; + sha256 = "1362rwmpv1y32w5m1fd9vqffs32244f0h7d5jm5cigiq2l7ix7n2"; }; vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl"; From 15457dc5b81e8428f32fa2fe221890756c11f0e7 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 25 Jun 2020 20:56:41 +0300 Subject: [PATCH 624/624] st: 0.8.3 -> 0.8.4 --- pkgs/applications/misc/st/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 018fd9306ae5..a772629a7aaa 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -4,11 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.8.3"; + pname = "st"; + version = "0.8.4"; src = fetchurl { - url = "https://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"; + url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; + sha256 = "19j66fhckihbg30ypngvqc9bcva47mp379ch5vinasjdxgn3qbfl"; }; inherit patches;